add alpine runtime group and build platforms package (#47002)

dotnet · Jan 14, 2021 · 95fe690 · 95fe690
1 parent 08bdd54
commit 95fe690
Show file tree

Hide file tree

Showing 6 changed files with 127 additions and 3 deletions.
diff --git a/eng/packaging.props b/eng/packaging.props
@@ -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>

diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj
@@ -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 -->

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -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",

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -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"

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -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">

diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json
@@ -1101,7 +1101,7 @@
         "3.0.0",
         "5.0.0"
       ],
-      "BaselineVersion": "5.0.0",
+      "BaselineVersion": "5.0.1",
       "InboxOn": {}
     },
     "Microsoft.NETCore.Targets": {