Skip to content

Fixes for XM 4.5 and netstandard13 and updated comments (#1758) #1827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spouliot merged 1 commit into from
Mar 7, 2017
Merged

Fixes for XM 4.5 and netstandard13 and updated comments (#1758) #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
<AssemblySearchPaths>$(XamarinMacFrameworkRoot)/lib/reference/full;$(XamarinMacFrameworkRoot)/lib/mono;$(AssemblySearchPaths)</AssemblySearchPaths>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' != 'Xamarin.Mac' And '$(UseXamMacFullFramework)' == 'true'">
<AssemblySearchPaths>$(XamarinMacFrameworkRoot)/lib/mono/4.5;$(AssemblySearchPaths)</AssemblySearchPaths>
</PropertyGroup>

<!-- Do not resolve from the GAC under any circumstances in Mobile or XM45 -->
<PropertyGroup Condition="(('$(TargetFrameworkIdentifier)' != 'Xamarin.Mac' And '$(UseXamMacFullFramework)' == 'true') Or '$(TargetFrameworkIdentifier)' == 'Xamarin.Mac') And !$(MonoBundlingExtraArgs.Contains('--allow-unsafe-gac-resolution'))" >
<AssemblySearchPaths>$([System.String]::Copy('$(AssemblySearchPaths)').Replace('{GAC}',''))</AssemblySearchPaths>
Expand Down
25 changes: 18 additions & 7 deletions msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.XM45.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,17 @@ Copyright (C) 2015 Xamarin Inc. All rights reserved.
-->

<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- These hacks will need to be rewritten if/when we move from xbuild to msbuild. Most likely to use FrameworkPathOverride, which should hopefully work.-->
<!-- This lets us bypass the standard MSBuild framework resolution and point to our copy. -->
<!-- Without this, we'll resolve System.dll and such from the system mono -->

<!-- The XM 4.5 target framework (will hopefully be renamed at some point) is a bit of a strange case -->
<!-- It does not declare a TargetFrameworkIdentifier so it can be compatible with "Desktop" nugets -->
<!-- These days it could have been done with some patches to nuget and such, but now can not be changed -->
<!-- without breaking some number of user projects (forward only mutation is rather unacceptable here) -->
<!-- So this file uses some hacks to force xbuild/msbuild to resolve to the BCL/mscorlib/Facades -->
<!-- we keep inside Xamarin.Mac's framework and not the system mono ones. System mono is not -->
<!-- necessarily in sync with ours and is not safe to depend upon -->

<!-- XBuild specific hacks -->
<!-- TargetFrameworkDirectory needs to point to ours, and FrameworkPathOverride does not work in xbuild, so we must override. -->
<Target Name="GetFrameworkPaths"
Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"
DependsOnTargets="$(GetFrameworkPathsDependsOn)">
Expand All @@ -26,7 +34,8 @@ Copyright (C) 2015 Xamarin Inc. All rights reserved.
</CreateProperty>
</Target>

<!-- Also part of the GetFrameworkPaths hack. -->
<!-- We only need to extend GetReferenceAssemblyPaths slightly, so we can force facades to only comes from our copy -->
<!-- but there is no invoking of a base target in msbuild. Copied from Microsoft.Common.targets with small changes -->
<Target Name="GetReferenceAssemblyPaths"
Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"
DependsOnTargets="$(GetReferenceAssemblyPathsDependsOn)">
Expand All @@ -40,16 +49,18 @@ Copyright (C) 2015 Xamarin Inc. All rights reserved.
<PropertyGroup Condition="'@(DesignTimeFacadeDirectories)' != ''">
<TargetFrameworkDirectory>$(TargetFrameworkDirectory);@(DesignTimeFacadeDirectories)</TargetFrameworkDirectory>
</PropertyGroup>
</Target>
</Target>

<!-- This lets us bypass the standard MSBuild resolution of mscorlib, which always picks an incompatible system copy. -->
<Target Name="_AddCorlibReference"
Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'"
DependsOnTargets="GetReferenceAssemblyPaths">
<ItemGroup>
<ItemGroup>
<_ExplicitReference Include="$(XamarinMacFrameworkRoot)/lib/mono/4.5/mscorlib.dll">
<Private>false</Private>
</_ExplicitReference>
</ItemGroup>
</Target>
</Target>
<!-- End the xbuild hacks -->
<!-- TODO - msbuild hacks -->
</Project>
2 changes: 1 addition & 1 deletion tools/mmp/driver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ static void Pack (IList<string> unprocessed)
throw new MonoMacException (23, true, "Application name '{0}.exe' conflicts with another user assembly.", root_wo_ext);

string monoFrameworkDirectory = TargetFramework.MonoFrameworkDirectory;
if (IsUnifiedFullSystemFramework || IsClassic)
if (IsUnifiedFullXamMacFramework || IsUnifiedFullSystemFramework || IsClassic)
monoFrameworkDirectory = "4.5";

fx_dir = Path.Combine (MonoDirectory, "lib", "mono", monoFrameworkDirectory);
Expand Down