Add alpine-arm64 to RID graph and use PackageReference for System.Data.SqlClient in tests again#37968
Merged
akoeplinger merged 3 commits intodotnet:masterfrom Jun 17, 2020
Conversation
|
Tagging subscribers to this area: @ViktorHofer |
6690aca to
c89bf70
Compare
ViktorHofer
reviewed
Jun 16, 2020
ViktorHofer
approved these changes
Jun 16, 2020
It was missing and caused a wrong RID graph to be generated.
The old approach doesn't work for mobile targets where we do self-contained publishing since we don't have the SqlClient dll in the in-tree runtime pack (and we don't want to put it there). While working on this I also removed some unnecessary duplication between Mono and CoreCLR in runtime.depproj.
…pendencyModel.Tests.csproj The older version references a non-existing assembly "System.Runtime.InteropServices.Pinvoke".
eaa2874 to
4b402d9
Compare
Member
ViktorHofer
approved these changes
Jun 17, 2020
Member
Author
ericstj
reviewed
Jun 17, 2020
| <RuntimeGroup Include="alpine"> | ||
| <Parent>linux-musl</Parent> | ||
| <Architectures>x64</Architectures> | ||
| <Architectures>x64;arm64</Architectures> |
Member
There was a problem hiding this comment.
Do all these versions support arm64? If not we could create a separate group for arm64.
Member
Author
There was a problem hiding this comment.
Yes, all the version back to our minimum 3.6 support arm64.
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Essentially reverts #31850 and fixes the underlying issue, which was that alpine-arm64 was missing from the RID graph.
This allows us to switch to PackageReference for SqlClient as the old approach doesn't work for mobile targets where we do self-contained publishing since we don't have the SqlClient dll in the in-tree runtime pack (and we don't want to put it there).
While working on this I also removed some unnecessary duplication between Mono and CoreCLR in runtime.depproj.
Also bumps Microsoft.DotNet.ProjectModel version in Microsoft.Extensions.DependencyModel.Tests.csproj
The older version references a non-existing assembly "System.Runtime.InteropServices.Pinvoke".