Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all 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.7</PlatformPackageVersion>
<PlatformPackageVersion>3.1.8</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
115 changes: 115 additions & 0 deletions pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,53 @@
"any",
"base"
],
"alpine.3.14": [
"alpine.3.14",
"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.14-x64": [
"alpine.3.14-x64",
"alpine.3.14",
"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 Expand Up @@ -625,6 +672,74 @@
"any",
"base"
],
"debian.11": [
"debian.11",
"debian",
"linux",
"unix",
"any",
"base"
],
"debian.11-arm": [
"debian.11-arm",
"debian.11",
"debian-arm",
"debian",
"linux-arm",
"linux",
"unix-arm",
"unix",
"any",
"base"
],
"debian.11-arm64": [
"debian.11-arm64",
"debian.11",
"debian-arm64",
"debian",
"linux-arm64",
"linux",
"unix-arm64",
"unix",
"any",
"base"
],
"debian.11-armel": [
"debian.11-armel",
"debian.11",
"debian-armel",
"debian",
"linux-armel",
"linux",
"unix-armel",
"unix",
"any",
"base"
],
"debian.11-x64": [
"debian.11-x64",
"debian.11",
"debian-x64",
"debian",
"linux-x64",
"linux",
"unix-x64",
"unix",
"any",
"base"
],
"debian.11-x86": [
"debian.11-x86",
"debian.11",
"debian-x86",
"debian",
"linux-x86",
"linux",
"unix-x86",
"unix",
"any",
"base"
],
"debian.8": [
"debian.8",
"debian",
Expand Down
46 changes: 46 additions & 0 deletions pkg/Microsoft.NETCore.Platforms/runtime.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,17 @@
"alpine.3.12-x64"
]
},
"alpine.3.14": {
"#import": [
"alpine.3.13"
]
},
"alpine.3.14-x64": {
"#import": [
"alpine.3.14",
"alpine.3.13-x64"
]
},
"alpine.3.6": {
"#import": [
"alpine"
Expand Down Expand Up @@ -286,6 +297,41 @@
"debian-x86"
]
},
"debian.11": {
"#import": [
"debian"
]
},
"debian.11-arm": {
"#import": [
"debian.11",
"debian-arm"
]
},
"debian.11-arm64": {
"#import": [
"debian.11",
"debian-arm64"
]
},
"debian.11-armel": {
"#import": [
"debian.11",
"debian-armel"
]
},
"debian.11-x64": {
"#import": [
"debian.11",
"debian-x64"
]
},
"debian.11-x86": {
"#import": [
"debian.11",
"debian-x86"
]
},
"debian.8": {
"#import": [
"debian"
Expand Down
4 changes: 2 additions & 2 deletions 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;3.13</Versions>
<Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14</Versions>
</RuntimeGroup>

<RuntimeGroup Include="android">
Expand All @@ -43,7 +43,7 @@
<RuntimeGroup Include="debian">
<Parent>linux</Parent>
<Architectures>x64;x86;arm;armel;arm64</Architectures>
<Versions>8;9;10</Versions>
<Versions>8;9;10;11</Versions>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>

Expand Down
5 changes: 3 additions & 2 deletions pkg/Microsoft.Private.PackageBaseline/packageIndex.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,10 @@
"3.1.4",
"3.1.5",
"3.1.6",
"3.1.7"
"3.1.7",
"3.1.8"
],
"BaselineVersion": "3.1.7",
"BaselineVersion": "3.1.8",
"InboxOn": {}
},
"Microsoft.NETCore.Platforms.Future": {
Expand Down
3 changes: 3 additions & 0 deletions src/packages.builds
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@
<Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.Windows.Compatibility\Microsoft.Windows.Compatibility.builds">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
<Project Include="$(MSBuildThisFileDirectory)..\pkg\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.builds">
<AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
</Project>
</ItemGroup>

<ItemGroup>
Expand Down