Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

[release/3.1] add Alpine 3.13 RID #43023

Merged
merged 5 commits into from
Feb 11, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<PackageVersion Condition="'$(PackageVersion)' == ''">4.7.0</PackageVersion>
<!-- major.minor.release version of the platforms package we're currently building
Pre-release will be appended during build -->
<PlatformPackageVersion>3.1.4</PlatformPackageVersion>
<PlatformPackageVersion>3.1.5</PlatformPackageVersion>
<SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
<SkipGenerationCheck>true</SkipGenerationCheck>
<!-- The index check here is used to determine if the assembly is containted in a stable package version.
Expand Down
44 changes: 44 additions & 0 deletions pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,50 @@
"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-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
11 changes: 11 additions & 0 deletions pkg/Microsoft.NETCore.Platforms/runtime.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,17 @@
"alpine.3.11-x64"
]
},
"alpine.3.13": {
"#import": [
"alpine.3.12"
]
},
"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 pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
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</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
3 changes: 2 additions & 1 deletion pkg/Microsoft.Private.PackageBaseline/packageIndex.json
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@
"3.0.0",
"3.1.1",
"3.1.2",
"3.1.3"
"3.1.3",
"3.1.5"
],
"BaselineVersion": "3.0.0",
"InboxOn": {}
Expand Down