Skip to content
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 @@ -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.2</PlatformPackageVersion>
<PlatformPackageVersion>5.0.3</PlatformPackageVersion>
<SkipValidatePackageTargetFramework>true</SkipValidatePackageTargetFramework>
<SkipGenerationCheck>true</SkipGenerationCheck>
</PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/libraries/libraries-packages.proj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<ProjectReference Include="$(PkgDir)*\*.proj" Exclude="$(PkgDir)test\*" Condition="'$(BuildAllOOBPackages)' == 'true'" />
<ProjectReference Include="$(MSBuildThisFileDirectory)*\pkg\**\*.pkgproj" Condition="('$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true') And '$(BuildAllOOBPackages)' == 'true'" />
<!-- If setting BuildAllOOBPackages to false, add bellow the individual OOB packages you want to continue to build -->
<ProjectReference Include="$(PkgDir)\Microsoft.NETCore.Platforms\Microsoft.NETCore.Platforms.proj" />
<!-- This is merge marker 1 to help automerge -->
<!-- This is merge marker 2 to help automerge -->
<!-- This is merge marker 3 to help automerge -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,113 @@
"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-arm": [
"alpine.3.14-arm",
"alpine.3.14",
"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.14-arm64": [
"alpine.3.14-arm64",
"alpine.3.14",
"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.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 @@ -1829,6 +1936,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
58 changes: 58 additions & 0 deletions src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,29 @@
"alpine.3.12-x64"
]
},
"alpine.3.14": {
"#import": [
"alpine.3.13"
]
},
"alpine.3.14-arm": {
"#import": [
"alpine.3.14",
"alpine.3.13-arm"
]
},
"alpine.3.14-arm64": {
"#import": [
"alpine.3.14",
"alpine.3.13-arm64"
]
},
"alpine.3.14-x64": {
"#import": [
"alpine.3.14",
"alpine.3.13-x64"
]
},
"alpine.3.6": {
"#import": [
"alpine"
Expand Down Expand Up @@ -671,6 +694,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
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;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 Down Expand Up @@ -53,7 +53,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
7 changes: 4 additions & 3 deletions src/libraries/pkg/baseline/packageIndex.json
Original file line number Diff line number Diff line change
Expand Up @@ -1109,9 +1109,10 @@
"3.0.0",
"5.0.0",
"5.0.1",
"5.0.2"
"5.0.2",
"5.0.3"
],
"BaselineVersion": "5.0.2",
"BaselineVersion": "5.0.3",
"InboxOn": {}
},
"Microsoft.NETCore.Targets": {
Expand Down Expand Up @@ -7535,4 +7536,4 @@
"System.Xml.XDocument"
]
}
}
}