[msbuild] Build the MSBuild task assemblies for netstandard2.0.#7706
Merged
Conversation
New commits in xamarin/Xamarin.MacDev: * dotnet/macios-devtools@210c664 Adds net451 to Xamarin.MacDev.csproj * dotnet/macios-devtools@64db365 [winios] Changes provisioning profiles default path * dotnet/macios-devtools@d34430a Switch to short-form projects and build for both net461 and netstandard2.0. (dotnet#68) Diff: https://github.com/xamarin/Xamarin.MacDev/compare/0f578f51e63b6ff93014782dbc9378e6b6bc6d75..210c664e56117d3a1a7f6dd002109eb444dbdc17
The older version doesn't support netstandard2.0. No code changes were required.
Also unify/deduplicate the ILMerge logic between Xamarin.iOS and Xamarin.Mac.
…sts for both netstandard2.0 and net461. Use custom project configurations to support running the tests for when the tasks assembly is built for netstandard2.0 and net461.
…oth netstandard2.0 and net461.
…er netstandard2.0 or net461.
rolfbjarne
requested review from
VincentDondain,
chamons,
emaf,
jstedfast and
kzu
as code owners
Contributor
|
Build failure Test results52 tests failed, 38 tests passed.Failed tests
|
Ask MSBuild to copy lib assemblies to the output folder when building for netstandard2.0, this way we can easily find the actual implementation libraries to pass to ILRepack.
Contributor
|
Build failure Test results29 tests failed, 61 tests passed.Failed tests
|
Contributor
|
Build success |
dalexsoto
approved these changes
Jan 16, 2020
emaf
approved these changes
Jan 16, 2020
Member
Author
|
Test failures are unrelated
|
kzu
reviewed
Jan 17, 2020
| <NetstandardDirectory>@(NetstandardPath)</NetstandardDirectory> | ||
| </PropertyGroup> | ||
| <!-- The assemblies are in a very different place when building for netstandard2.0, which means we need different logic to find them too --> | ||
| <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> |
Contributor
There was a problem hiding this comment.
Should this be $(TargetFramework.StartsWith('netstandard')) instead to make it more future-proof?
| <MergedAssemblies Include="@(ReferencePath)" Condition="'%(FileName)' == 'Mono.Posix.NETStandard'" /> | ||
| <MergedAssemblies Include="@(ReferencePath)" Condition="'%(Extension)' == '.dll' And $([System.String]::new('%(FileName)').StartsWith('Mono.Cecil', StringComparison.OrdinalIgnoreCase))" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> |
Contributor
There was a problem hiding this comment.
Ditto here, $(TargetFramework.StartsWith('net4'))? (since VSM and most other libs are already starting to target net472 instead?)
| </ItemGroup> | ||
| <ItemGroup Condition="'$(TargetFramework)' == 'net461'"> | ||
| <MergedAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.dll' | ||
| And !$([System.String]::new('%(FileName)').EndsWith('.resources', StringComparison.OrdinalIgnoreCase)) |
Contributor
There was a problem hiding this comment.
I usually prefer [MSBuild]::ValueOrDefault which doesn't incur a string allocation. In this case, it would be: !$([MSBuild]::ValueOrDefault('%(FileName)', '').EndsWith('.resources', StringComparison.OrdinalIgnoreCase)).
See dotnet/msbuild#4615 for more context too.
Contributor
|
Sorry for the late review @rolfbjarne, but they are minor improvements anyway. 👍 |
rolfbjarne
added a commit
to rolfbjarne/macios
that referenced
this pull request
Feb 4, 2020
According to review of dotnet#7706.
Member
Author
|
@kzu,
Thanks! Suggested edits: Fixed in #7790. |
rolfbjarne
added a commit
that referenced
this pull request
Feb 5, 2020
According to review of #7706.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
This is a necessary step towards making the task assemblies work with .NET 5.
The old code (to build for net461) is still present, and it's easy to switch
back if need be. Eventually the old code should be removed.
Best reviewed commit-by-commit.