Browse Source

Fix assembly resolution for Mono projects targeting .NET 4

pull/42/merge
Matt Ward 13 years ago
parent
commit
7f94fdf39a
  1. 15
      samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Dmcs.targets

15
samples/Mono/Mono.Build.Tasks/SharpDevelop.Build.Mono.Dmcs.targets

@ -28,7 +28,9 @@
</AssemblySearchPaths> </AssemblySearchPaths>
</PropertyGroup> </PropertyGroup>
<Target Name="GetFrameworkPaths"> <Target
Name="GetFrameworkPaths"
Returns="@(_ExplicitReference)">
<!-- Get the path to the target Mono Framework directory. --> <!-- Get the path to the target Mono Framework directory. -->
<GetMonoFrameworkPath TargetFrameworkVersion="$(MonoTargetFrameworkVersion)"> <GetMonoFrameworkPath TargetFrameworkVersion="$(MonoTargetFrameworkVersion)">
<Output TaskParameter="Path" PropertyName="TargetFrameworkDirectory"/> <Output TaskParameter="Path" PropertyName="TargetFrameworkDirectory"/>
@ -40,6 +42,11 @@
<Output TaskParameter="Path" PropertyName="TargetFrameworkSDKDirectory"/> <Output TaskParameter="Path" PropertyName="TargetFrameworkSDKDirectory"/>
<Output TaskParameter="Path" ItemName="_TargetFrameworkSDKDirectoryItem"/> <Output TaskParameter="Path" ItemName="_TargetFrameworkSDKDirectoryItem"/>
</GetMonoFrameworkSDKPath> </GetMonoFrameworkSDKPath>
<ItemGroup>
<_ExplicitReference Remove="1"/>
<_ExplicitReference Include="$(TargetFrameworkDirectory)\mscorlib.dll"/>
</ItemGroup>
</Target> </Target>
<!-- Modify what the ResolveAssemblyReferences tasks depends on so the <!-- Modify what the ResolveAssemblyReferences tasks depends on so the
@ -47,7 +54,6 @@
<PropertyGroup> <PropertyGroup>
<ResolveAssemblyReferencesDependsOn> <ResolveAssemblyReferencesDependsOn>
GetFrameworkPaths; GetFrameworkPaths;
GetReferenceAssemblyPaths;
PrepareForBuild; PrepareForBuild;
AddMonoAssemblySearchPaths AddMonoAssemblySearchPaths
</ResolveAssemblyReferencesDependsOn> </ResolveAssemblyReferencesDependsOn>
@ -61,6 +67,9 @@
</AddMonoAssemblySearchPaths> </AddMonoAssemblySearchPaths>
</Target> </Target>
<Target Name="GetReferenceAssemblyPaths">
</Target>
<Target <Target
Name="CoreCompile" Name="CoreCompile"
Inputs="$(MSBuildAllProjects); Inputs="$(MSBuildAllProjects);
@ -108,6 +117,6 @@
WarningLevel="$(WarningLevel)" WarningLevel="$(WarningLevel)"
Win32Icon="$(ApplicationIcon)" Win32Icon="$(ApplicationIcon)"
Win32Resource="$(Win32Resource)" /> Win32Resource="$(Win32Resource)" />
</Target> </Target>
</Project> </Project>

Loading…
Cancel
Save