Skip to content

[msbuild] Skip reference assemblies passed to mtouch #3791

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
VincentDondain merged 9 commits into from
Mar 28, 2018
Merged

[msbuild] Skip reference assemblies passed to mtouch #3791

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d24f7fe
[msbuild] Skip reference assemblies passed to mtouch
VincentDondain Mar 20, 2018
f095296
Bye bye hardcoded path comparison
VincentDondain Mar 22, 2018
fb7b79d
Even simpler
VincentDondain Mar 22, 2018
3e76335
[msbuild] Add monotouch-test test
VincentDondain Mar 23, 2018
044b34b
[makefile] Enable msbuild for generated makefiles
VincentDondain Mar 26, 2018
72a633d
[xharness] Use msbuild in some places too
VincentDondain Mar 26, 2018
6e96017
Revert "[msbuild] Add monotouch-test test"
VincentDondain Mar 27, 2018
d17b541
Revert "[makefile] Enable msbuild for generated makefiles"
VincentDondain Mar 27, 2018
598956e
Revert "[xharness] Use msbuild in some places too"
VincentDondain Mar 27, 2018
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
5 changes: 5 additions & 0 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -780,6 +780,11 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
Outputs="$(_NativeExecutable);$(DeviceSpecificOutputPath)mtouch.stamp">

<ItemGroup>
<!-- Skip the reference assemblies. There is currently no scenario where it is valid to pass them to 'mtouch'. They are impossible to AOT. Fixes: https://github.com/xamarin/xamarin-macios/issues/3199 -->
<!-- Remove exact references, such as if a package had a framework reference to 'System' that we already have -->
<!-- This is exactly what "Microsoft.NuGet.Build.Tasks"'s 'ResolveNuGetPackageAssets' target is doing -->
<!-- Effectively 'ResolveNuGetPackageAssets' computes the NuGet packages using their json asset file, adds the full assemblies to 'ReferenceCopyLocalPaths' and outputs the resolved references via '_ReferencesFromNuGetPackages' -->
<ReferencePath Remove="@(_ReferencesFromNuGetPackages)" />
<MTouchReferencePath Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.dll'" />
</ItemGroup>

Expand Down