Skip to content
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

add alpine runtime group and build platforms package #47002

Merged
merged 1 commit into from
Jan 14, 2021
Merged

add alpine runtime group and build platforms package #47002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 eng/packaging.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PackageVersion Condition="'$(PackageVersion)' == ''">$(ProductVersion)</PackageVersion>
<!-- major.minor.release version of the platforms package we're currently building
Pre-release will be appended during build -->
<PlatformPackageVersion>5.0.0</PlatformPackageVersion>
<PlatformPackageVersion>5.0.1</PlatformPackageVersion>
<SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
<SkipGenerationCheck>true</SkipGenerationCheck>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/libraries/libraries-packages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<ProjectReference Include="$(LibrariesProjectRoot)\System.Speech\pkg\System.Speech.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<ProjectReference Include="$(LibrariesProjectRoot)\System.Diagnostics.PerformanceCounter\pkg\System.Diagnostics.PerformanceCounter.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<ProjectReference Include="$(LibrariesProjectRoot)\System.Diagnostics.EventLog\pkg\System.Diagnostics.EventLog.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
<ProjectReference Include="$(PkgDir)\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.proj" />
</ItemGroup>

<!-- Need the PackageIndexFile file property from baseline.props -->
Expand Down
100 changes: 100 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 @@ -301,6 +301,106 @@
"any",
"base"
],
"alpine.3.13": [
"alpine.3.13",
"alpine.3.12",
"alpine.3.11",
"alpine.3.10",
"alpine.3.9",
"alpine.3.8",
"alpine.3.7",
"alpine.3.6",
"alpine",
"linux-musl",
"linux",
"unix",
"any",
"base"
],
"alpine.3.13-arm": [
"alpine.3.13-arm",
"alpine.3.13",
"alpine.3.12-arm",
"alpine.3.12",
"alpine.3.11-arm",
"alpine.3.11",
"alpine.3.10-arm",
"alpine.3.10",
"alpine.3.9-arm",
"alpine.3.9",
"alpine.3.8-arm",
"alpine.3.8",
"alpine.3.7-arm",
"alpine.3.7",
"alpine.3.6-arm",
"alpine.3.6",
"alpine-arm",
"alpine",
"linux-musl-arm",
"linux-musl",
"linux-arm",
"linux",
"unix-arm",
"unix",
"any",
"base"
],
"alpine.3.13-arm64": [
"alpine.3.13-arm64",
"alpine.3.13",
"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.13-x64": [
"alpine.3.13-x64",
"alpine.3.13",
"alpine.3.12-x64",
"alpine.3.12",
"alpine.3.11-x64",
"alpine.3.11",
"alpine.3.10-x64",
"alpine.3.10",
"alpine.3.9-x64",
"alpine.3.9",
"alpine.3.8-x64",
"alpine.3.8",
"alpine.3.7-x64",
"alpine.3.7",
"alpine.3.6-x64",
"alpine.3.6",
"alpine-x64",
"alpine",
"linux-musl-x64",
"linux-musl",
"linux-x64",
"linux",
"unix-x64",
"unix",
"any",
"base"
],
"alpine.3.6": [
"alpine.3.6",
"alpine",
Expand Down
23 changes: 23 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 @@ -92,6 +92,29 @@
"alpine.3.11-x64"
]
},
"alpine.3.13": {
"#import": [
"alpine.3.12"
]
},
"alpine.3.13-arm": {
"#import": [
"alpine.3.13",
"alpine.3.12-arm"
]
},
"alpine.3.13-arm64": {
"#import": [
"alpine.3.13",
"alpine.3.12-arm64"
]
},
"alpine.3.13-x64": {
"#import": [
"alpine.3.13",
"alpine.3.12-x64"
]
},
"alpine.3.6": {
"#import": [
"alpine"
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 @@ -16,7 +16,7 @@
<RuntimeGroup Include="alpine">
<Parent>linux-musl</Parent>
<Architectures>x64;arm;arm64</Architectures>
<Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12</Versions>
<Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13</Versions>
</RuntimeGroup>

<RuntimeGroup Include="android">
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/pkg/baseline/packageIndex.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,7 @@
"3.0.0",
"5.0.0"
],
"BaselineVersion": "5.0.0",
"BaselineVersion": "5.0.1",
"InboxOn": {}
},
"Microsoft.NETCore.Targets": {
Expand Down