Skip to content

Add alpine-arm64 to RID graph and use PackageReference for System.Data.SqlClient in tests again #37968

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
akoeplinger merged 3 commits into from
Jun 17, 2020
Merged

Add alpine-arm64 to RID graph and use PackageReference for System.Data.SqlClient in tests again #37968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee781c1
Add alpine-arm64 to the RID graph
akoeplinger Jun 16, 2020
6b9a86e
Use PackageReference for System.Data.SqlClient again
akoeplinger Jun 16, 2020
4b402d9
Bump Microsoft.DotNet.ProjectModel version in Microsoft.Extensions.De…
akoeplinger Jun 16, 2020
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
2 changes: 1 addition & 1 deletion ...rosoft.Extensions.DependencyModel/tests/Microsoft.Extensions.DependencyModel.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
<PackageReference Include="FluentAssertions" Version="4.19.4" />
<PackageReference Include="Moq" Version="$(MoqVersion)" />
<PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc2-002702" />
<PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc3-003121" />
<!-- Upgrade the transitive dependency's version to avoid PackageTargetFallback on .NETCoreApp. -->
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,7 @@
<Compile Include="$(CommonTestPath)System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs"
Link="Common\System\Runtime\Serialization\Formatters\BinaryFormatterHelpers.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions ...ntime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@
<ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
<Reference Include="System.Text.Json" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientVersion)" />
</ItemGroup>
</Project>
152 changes: 152 additions & 0 deletions src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,18 @@
"any",
"base"
],
"alpine-arm64": [
"alpine-arm64",
"alpine",
"linux-musl-arm64",
"linux-musl",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"alpine-x64": [
"alpine-x64",
"alpine",
Expand All @@ -32,6 +44,28 @@
"any",
"base"
],
"alpine.3.10-arm64": [
"alpine.3.10-arm64",
"alpine.3.10",
"alpine.3.9-arm64",
"alpine.3.9",
"alpine.3.8-arm64",
"alpine.3.8",
"alpine.3.7-arm64",
"alpine.3.7",
"alpine.3.6-arm64",
"alpine.3.6",
"alpine-arm64",
"alpine",
"linux-musl-arm64",
"linux-musl",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"alpine.3.10-x64": [
"alpine.3.10-x64",
"alpine.3.10",
Expand Down Expand Up @@ -68,6 +102,30 @@
"any",
"base"
],
"alpine.3.11-arm64": [
"alpine.3.11-arm64",
"alpine.3.11",
"alpine.3.10-arm64",
"alpine.3.10",
"alpine.3.9-arm64",
"alpine.3.9",
"alpine.3.8-arm64",
"alpine.3.8",
"alpine.3.7-arm64",
"alpine.3.7",
"alpine.3.6-arm64",
"alpine.3.6",
"alpine-arm64",
"alpine",
"linux-musl-arm64",
"linux-musl",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"alpine.3.11-x64": [
"alpine.3.11-x64",
"alpine.3.11",
Expand Down Expand Up @@ -107,6 +165,32 @@
"any",
"base"
],
"alpine.3.12-arm64": [
"alpine.3.12-arm64",
"alpine.3.12",
"alpine.3.11-arm64",
"alpine.3.11",
"alpine.3.10-arm64",
"alpine.3.10",
"alpine.3.9-arm64",
"alpine.3.9",
"alpine.3.8-arm64",
"alpine.3.8",
"alpine.3.7-arm64",
"alpine.3.7",
"alpine.3.6-arm64",
"alpine.3.6",
"alpine-arm64",
"alpine",
"linux-musl-arm64",
"linux-musl",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"alpine.3.12-x64": [
"alpine.3.12-x64",
"alpine.3.12",
Expand Down Expand Up @@ -142,6 +226,20 @@
"any",
"base"
],
"alpine.3.6-arm64": [
"alpine.3.6-arm64",
"alpine.3.6",
"alpine-arm64",
"alpine",
"linux-musl-arm64",
"linux-musl",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"alpine.3.6-x64": [
"alpine.3.6-x64",
"alpine.3.6",
Expand All @@ -166,6 +264,22 @@
"any",
"base"
],
"alpine.3.7-arm64": [
"alpine.3.7-arm64",
"alpine.3.7",
"alpine.3.6-arm64",
"alpine.3.6",
"alpine-arm64",
"alpine",
"linux-musl-arm64",
"linux-musl",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"alpine.3.7-x64": [
"alpine.3.7-x64",
"alpine.3.7",
Expand Down Expand Up @@ -193,6 +307,24 @@
"any",
"base"
],
"alpine.3.8-arm64": [
"alpine.3.8-arm64",
"alpine.3.8",
"alpine.3.7-arm64",
"alpine.3.7",
"alpine.3.6-arm64",
"alpine.3.6",
"alpine-arm64",
"alpine",
"linux-musl-arm64",
"linux-musl",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"alpine.3.8-x64": [
"alpine.3.8-x64",
"alpine.3.8",
Expand Down Expand Up @@ -223,6 +355,26 @@
"any",
"base"
],
"alpine.3.9-arm64": [
"alpine.3.9-arm64",
"alpine.3.9",
"alpine.3.8-arm64",
"alpine.3.8",
"alpine.3.7-arm64",
"alpine.3.7",
"alpine.3.6-arm64",
"alpine.3.6",
"alpine-arm64",
"alpine",
"linux-musl-arm64",
"linux-musl",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"alpine.3.9-x64": [
"alpine.3.9-x64",
"alpine.3.9",
Expand Down
48 changes: 48 additions & 0 deletions src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
"linux-musl"
]
},
"alpine-arm64": {
"#import": [
"alpine",
"linux-musl-arm64"
]
},
"alpine-x64": {
"#import": [
"alpine",
Expand All @@ -16,6 +22,12 @@
"alpine.3.9"
]
},
"alpine.3.10-arm64": {
"#import": [
"alpine.3.10",
"alpine.3.9-arm64"
]
},
"alpine.3.10-x64": {
"#import": [
"alpine.3.10",
Expand All @@ -27,6 +39,12 @@
"alpine.3.10"
]
},
"alpine.3.11-arm64": {
"#import": [
"alpine.3.11",
"alpine.3.10-arm64"
]
},
"alpine.3.11-x64": {
"#import": [
"alpine.3.11",
Expand All @@ -38,6 +56,12 @@
"alpine.3.11"
]
},
"alpine.3.12-arm64": {
"#import": [
"alpine.3.12",
"alpine.3.11-arm64"
]
},
"alpine.3.12-x64": {
"#import": [
"alpine.3.12",
Expand All @@ -49,6 +73,12 @@
"alpine"
]
},
"alpine.3.6-arm64": {
"#import": [
"alpine.3.6",
"alpine-arm64"
]
},
"alpine.3.6-x64": {
"#import": [
"alpine.3.6",
Expand All @@ -60,6 +90,12 @@
"alpine.3.6"
]
},
"alpine.3.7-arm64": {
"#import": [
"alpine.3.7",
"alpine.3.6-arm64"
]
},
"alpine.3.7-x64": {
"#import": [
"alpine.3.7",
Expand All @@ -71,6 +107,12 @@
"alpine.3.7"
]
},
"alpine.3.8-arm64": {
"#import": [
"alpine.3.8",
"alpine.3.7-arm64"
]
},
"alpine.3.8-x64": {
"#import": [
"alpine.3.8",
Expand All @@ -82,6 +124,12 @@
"alpine.3.8"
]
},
"alpine.3.9-arm64": {
"#import": [
"alpine.3.9",
"alpine.3.8-arm64"
]
},
"alpine.3.9-x64": {
"#import": [
"alpine.3.9",
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<RuntimeGroup Include="alpine">
<Parent>linux-musl</Parent>
<Architectures>x64</Architectures>
<Architectures>x64;arm64</Architectures>
Copy link
Member

@ericstj ericstj Jun 17, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do all these versions support arm64? If not we could create a separate group for arm64.

Copy link
Member Author

@akoeplinger akoeplinger Jun 17, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, all the version back to our minimum 3.6 support arm64.

<Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12</Versions>
</RuntimeGroup>

Expand Down
Loading