[macos] Fix msbuild issues with shprojj/projitem library #1936
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- In some build cases this chunk of code:
<ItemGroup Condition=" '$(NoCompilerStandardLib)' == 'true' and '$(NoStdLib)' != 'true' ">
<!-- Note that unlike VB, C# does not automatically locate System.dll as a "standard library"
instead the reference is always passed from the project. Also, for mscorlib.dll
we need to provide the explicit location in order to maintain the correct behaviour
-->
<_ExplicitReference Include="$(FrameworkPathOverride)\mscorlib.dll" />
</ItemGroup>
would trigger and force us to use mscorlib from system mono. That does not work well.
- By setting FrameworkPathOverride, we can get the right mscorlib
- However, that ItemGroup happens outside of a target, so we must move our setting to match for it to take effect
radical
approved these changes
Mar 29, 2017
Member
radical
left a comment
radical
left a comment
There was a problem hiding this comment.
The msbuild change looks fine. I didn't really look at the test.
Contributor
Author
timrisi
approved these changes
Mar 29, 2017
Collaborator
|
Build success |
spouliot
approved these changes
Mar 30, 2017
Contributor
spouliot
left a comment
spouliot
left a comment
There was a problem hiding this comment.
👍 for adding a test case :)
rolfbjarne
approved these changes
Mar 30, 2017
kzu
suggested changes
Mar 30, 2017
|
|
||
| <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <!-- MSBuild specific hacks - Teach msbuild where to find our BCL and facades --> | ||
| <PropertyGroup> |
Contributor
There was a problem hiding this comment.
This should have a Condition="'$(OS)' != 'Win_NT'"
| <MacBclPath Condition="'$(TargetFrameworkIdentifier)' == 'Xamarin.Mac'">$(XamarinMacFrameworkRoot)/lib/mono/Xamarin.Mac</MacBclPath> | ||
| <FrameworkPathOverride>$(MacBclPath)</FrameworkPathOverride> | ||
| </PropertyGroup> | ||
| <Target Name="FixTargetFrameworkDirectory" AfterTargets="GetReferenceAssemblyPaths"> |
Contributor
There was a problem hiding this comment.
Ditto here: Condition="'$(OS)' != 'Win_NT'"
Contributor
Author
|
@kzu Changes made. |
kzu
approved these changes
Mar 30, 2017
Collaborator
|
Build failure |
1 similar comment
Collaborator
|
Build failure |
Contributor
Author
|
Known random failure - https://bugzilla.xamarin.com/show_bug.cgi?id=52968 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In some build cases this chunk of code:
<_ExplicitReference Include="$(FrameworkPathOverride)\mscorlib.dll" />would trigger and force us to use mscorlib from system mono. That does not work well.