diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
index cec6973983409f..84d4bb8860406c 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
@@ -19,7 +19,8 @@
 
     <!-- When building from source, ensure the RID we're building for is part of the RID graph -->
     <AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
-    <ServicingVersion>7</ServicingVersion>
+    <ServicingVersion>8</ServicingVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index 0fd8c2d24e1d91..83e1e8476c1794 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -31,6 +31,18 @@
     "any",
     "base"
   ],
+  "alpine-s390x": [
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine-x64": [
     "alpine-x64",
     "alpine",
@@ -55,18 +67,6 @@
     "any",
     "base"
   ],
-  "alpine-s390x": [
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.10": [
     "alpine.3.10",
     "alpine.3.9",
@@ -124,6 +124,28 @@
     "any",
     "base"
   ],
+  "alpine.3.10-s390x": [
+    "alpine.3.10-s390x",
+    "alpine.3.10",
+    "alpine.3.9-s390x",
+    "alpine.3.9",
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.10-x64": [
     "alpine.3.10-x64",
     "alpine.3.10",
@@ -168,28 +190,6 @@
     "any",
     "base"
   ],
-  "alpine.3.10-s390x": [
-    "alpine.3.10-s390x",
-    "alpine.3.10",
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.11": [
     "alpine.3.11",
     "alpine.3.10",
@@ -252,6 +252,30 @@
     "any",
     "base"
   ],
+  "alpine.3.11-s390x": [
+    "alpine.3.11-s390x",
+    "alpine.3.11",
+    "alpine.3.10-s390x",
+    "alpine.3.10",
+    "alpine.3.9-s390x",
+    "alpine.3.9",
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.11-x64": [
     "alpine.3.11-x64",
     "alpine.3.11",
@@ -300,30 +324,6 @@
     "any",
     "base"
   ],
-  "alpine.3.11-s390x": [
-    "alpine.3.11-s390x",
-    "alpine.3.11",
-    "alpine.3.10-s390x",
-    "alpine.3.10",
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.12": [
     "alpine.3.12",
     "alpine.3.11",
@@ -391,6 +391,32 @@
     "any",
     "base"
   ],
+  "alpine.3.12-s390x": [
+    "alpine.3.12-s390x",
+    "alpine.3.12",
+    "alpine.3.11-s390x",
+    "alpine.3.11",
+    "alpine.3.10-s390x",
+    "alpine.3.10",
+    "alpine.3.9-s390x",
+    "alpine.3.9",
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.12-x64": [
     "alpine.3.12-x64",
     "alpine.3.12",
@@ -443,32 +469,6 @@
     "any",
     "base"
   ],
-  "alpine.3.12-s390x": [
-    "alpine.3.12-s390x",
-    "alpine.3.12",
-    "alpine.3.11-s390x",
-    "alpine.3.11",
-    "alpine.3.10-s390x",
-    "alpine.3.10",
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.13": [
     "alpine.3.13",
     "alpine.3.12",
@@ -541,6 +541,34 @@
     "any",
     "base"
   ],
+  "alpine.3.13-s390x": [
+    "alpine.3.13-s390x",
+    "alpine.3.13",
+    "alpine.3.12-s390x",
+    "alpine.3.12",
+    "alpine.3.11-s390x",
+    "alpine.3.11",
+    "alpine.3.10-s390x",
+    "alpine.3.10",
+    "alpine.3.9-s390x",
+    "alpine.3.9",
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.13-x64": [
     "alpine.3.13-x64",
     "alpine.3.13",
@@ -597,34 +625,6 @@
     "any",
     "base"
   ],
-  "alpine.3.13-s390x": [
-    "alpine.3.13-s390x",
-    "alpine.3.13",
-    "alpine.3.12-s390x",
-    "alpine.3.12",
-    "alpine.3.11-s390x",
-    "alpine.3.11",
-    "alpine.3.10-s390x",
-    "alpine.3.10",
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.14": [
     "alpine.3.14",
     "alpine.3.13",
@@ -702,6 +702,36 @@
     "any",
     "base"
   ],
+  "alpine.3.14-s390x": [
+    "alpine.3.14-s390x",
+    "alpine.3.14",
+    "alpine.3.13-s390x",
+    "alpine.3.13",
+    "alpine.3.12-s390x",
+    "alpine.3.12",
+    "alpine.3.11-s390x",
+    "alpine.3.11",
+    "alpine.3.10-s390x",
+    "alpine.3.10",
+    "alpine.3.9-s390x",
+    "alpine.3.9",
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.14-x64": [
     "alpine.3.14-x64",
     "alpine.3.14",
@@ -762,36 +792,6 @@
     "any",
     "base"
   ],
-  "alpine.3.14-s390x": [
-    "alpine.3.14-s390x",
-    "alpine.3.14",
-    "alpine.3.13-s390x",
-    "alpine.3.13",
-    "alpine.3.12-s390x",
-    "alpine.3.12",
-    "alpine.3.11-s390x",
-    "alpine.3.11",
-    "alpine.3.10-s390x",
-    "alpine.3.10",
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.15": [
     "alpine.3.15",
     "alpine.3.14",
@@ -874,6 +874,38 @@
     "any",
     "base"
   ],
+  "alpine.3.15-s390x": [
+    "alpine.3.15-s390x",
+    "alpine.3.15",
+    "alpine.3.14-s390x",
+    "alpine.3.14",
+    "alpine.3.13-s390x",
+    "alpine.3.13",
+    "alpine.3.12-s390x",
+    "alpine.3.12",
+    "alpine.3.11-s390x",
+    "alpine.3.11",
+    "alpine.3.10-s390x",
+    "alpine.3.10",
+    "alpine.3.9-s390x",
+    "alpine.3.9",
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.15-x64": [
     "alpine.3.15-x64",
     "alpine.3.15",
@@ -938,38 +970,6 @@
     "any",
     "base"
   ],
-  "alpine.3.15-s390x": [
-    "alpine.3.15-s390x",
-    "alpine.3.15",
-    "alpine.3.14-s390x",
-    "alpine.3.14",
-    "alpine.3.13-s390x",
-    "alpine.3.13",
-    "alpine.3.12-s390x",
-    "alpine.3.12",
-    "alpine.3.11-s390x",
-    "alpine.3.11",
-    "alpine.3.10-s390x",
-    "alpine.3.10",
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.16": [
     "alpine.3.16",
     "alpine.3.15",
@@ -1057,6 +1057,40 @@
     "any",
     "base"
   ],
+  "alpine.3.16-s390x": [
+    "alpine.3.16-s390x",
+    "alpine.3.16",
+    "alpine.3.15-s390x",
+    "alpine.3.15",
+    "alpine.3.14-s390x",
+    "alpine.3.14",
+    "alpine.3.13-s390x",
+    "alpine.3.13",
+    "alpine.3.12-s390x",
+    "alpine.3.12",
+    "alpine.3.11-s390x",
+    "alpine.3.11",
+    "alpine.3.10-s390x",
+    "alpine.3.10",
+    "alpine.3.9-s390x",
+    "alpine.3.9",
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.16-x64": [
     "alpine.3.16-x64",
     "alpine.3.16",
@@ -1125,40 +1159,6 @@
     "any",
     "base"
   ],
-  "alpine.3.16-s390x": [
-    "alpine.3.16-s390x",
-    "alpine.3.16",
-    "alpine.3.15-s390x",
-    "alpine.3.15",
-    "alpine.3.14-s390x",
-    "alpine.3.14",
-    "alpine.3.13-s390x",
-    "alpine.3.13",
-    "alpine.3.12-s390x",
-    "alpine.3.12",
-    "alpine.3.11-s390x",
-    "alpine.3.11",
-    "alpine.3.10-s390x",
-    "alpine.3.10",
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.17": [
     "alpine.3.17",
     "alpine.3.16",
@@ -1251,6 +1251,42 @@
     "any",
     "base"
   ],
+  "alpine.3.17-s390x": [
+    "alpine.3.17-s390x",
+    "alpine.3.17",
+    "alpine.3.16-s390x",
+    "alpine.3.16",
+    "alpine.3.15-s390x",
+    "alpine.3.15",
+    "alpine.3.14-s390x",
+    "alpine.3.14",
+    "alpine.3.13-s390x",
+    "alpine.3.13",
+    "alpine.3.12-s390x",
+    "alpine.3.12",
+    "alpine.3.11-s390x",
+    "alpine.3.11",
+    "alpine.3.10-s390x",
+    "alpine.3.10",
+    "alpine.3.9-s390x",
+    "alpine.3.9",
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.17-x64": [
     "alpine.3.17-x64",
     "alpine.3.17",
@@ -1323,42 +1359,6 @@
     "any",
     "base"
   ],
-  "alpine.3.17-s390x": [
-    "alpine.3.17-s390x",
-    "alpine.3.17",
-    "alpine.3.16-s390x",
-    "alpine.3.16",
-    "alpine.3.15-s390x",
-    "alpine.3.15",
-    "alpine.3.14-s390x",
-    "alpine.3.14",
-    "alpine.3.13-s390x",
-    "alpine.3.13",
-    "alpine.3.12-s390x",
-    "alpine.3.12",
-    "alpine.3.11-s390x",
-    "alpine.3.11",
-    "alpine.3.10-s390x",
-    "alpine.3.10",
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.6": [
     "alpine.3.6",
     "alpine",
@@ -1396,6 +1396,20 @@
     "any",
     "base"
   ],
+  "alpine.3.6-s390x": [
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.6-x64": [
     "alpine.3.6-x64",
     "alpine.3.6",
@@ -1424,20 +1438,6 @@
     "any",
     "base"
   ],
-  "alpine.3.6-s390x": [
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.7": [
     "alpine.3.7",
     "alpine.3.6",
@@ -1480,6 +1480,22 @@
     "any",
     "base"
   ],
+  "alpine.3.7-s390x": [
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.7-x64": [
     "alpine.3.7-x64",
     "alpine.3.7",
@@ -1512,22 +1528,6 @@
     "any",
     "base"
   ],
-  "alpine.3.7-s390x": [
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.8": [
     "alpine.3.8",
     "alpine.3.7",
@@ -1575,6 +1575,24 @@
     "any",
     "base"
   ],
+  "alpine.3.8-s390x": [
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.8-x64": [
     "alpine.3.8-x64",
     "alpine.3.8",
@@ -1611,24 +1629,6 @@
     "any",
     "base"
   ],
-  "alpine.3.8-s390x": [
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.9": [
     "alpine.3.9",
     "alpine.3.8",
@@ -1681,6 +1681,26 @@
     "any",
     "base"
   ],
+  "alpine.3.9-s390x": [
+    "alpine.3.9-s390x",
+    "alpine.3.9",
+    "alpine.3.8-s390x",
+    "alpine.3.8",
+    "alpine.3.7-s390x",
+    "alpine.3.7",
+    "alpine.3.6-s390x",
+    "alpine.3.6",
+    "alpine-s390x",
+    "alpine",
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "alpine.3.9-x64": [
     "alpine.3.9-x64",
     "alpine.3.9",
@@ -1721,26 +1741,6 @@
     "any",
     "base"
   ],
-  "alpine.3.9-s390x": [
-    "alpine.3.9-s390x",
-    "alpine.3.9",
-    "alpine.3.8-s390x",
-    "alpine.3.8",
-    "alpine.3.7-s390x",
-    "alpine.3.7",
-    "alpine.3.6-s390x",
-    "alpine.3.6",
-    "alpine-s390x",
-    "alpine",
-    "linux-musl-s390x",
-    "linux-musl",
-    "linux-s390x",
-    "linux",
-    "unix-s390x",
-    "unix",
-    "any",
-    "base"
-  ],
   "android": [
     "android",
     "linux",
@@ -2899,6 +2899,161 @@
     "any",
     "base"
   ],
+  "android.32": [
+    "android.32",
+    "android.31",
+    "android.30",
+    "android.29",
+    "android.28",
+    "android.27",
+    "android.26",
+    "android.25",
+    "android.24",
+    "android.23",
+    "android.22",
+    "android.21",
+    "android",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "android.32-arm": [
+    "android.32-arm",
+    "android.32",
+    "android.31-arm",
+    "android.31",
+    "android.30-arm",
+    "android.30",
+    "android.29-arm",
+    "android.29",
+    "android.28-arm",
+    "android.28",
+    "android.27-arm",
+    "android.27",
+    "android.26-arm",
+    "android.26",
+    "android.25-arm",
+    "android.25",
+    "android.24-arm",
+    "android.24",
+    "android.23-arm",
+    "android.23",
+    "android.22-arm",
+    "android.22",
+    "android.21-arm",
+    "android.21",
+    "android-arm",
+    "android",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
+  "android.32-arm64": [
+    "android.32-arm64",
+    "android.32",
+    "android.31-arm64",
+    "android.31",
+    "android.30-arm64",
+    "android.30",
+    "android.29-arm64",
+    "android.29",
+    "android.28-arm64",
+    "android.28",
+    "android.27-arm64",
+    "android.27",
+    "android.26-arm64",
+    "android.26",
+    "android.25-arm64",
+    "android.25",
+    "android.24-arm64",
+    "android.24",
+    "android.23-arm64",
+    "android.23",
+    "android.22-arm64",
+    "android.22",
+    "android.21-arm64",
+    "android.21",
+    "android-arm64",
+    "android",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "android.32-x64": [
+    "android.32-x64",
+    "android.32",
+    "android.31-x64",
+    "android.31",
+    "android.30-x64",
+    "android.30",
+    "android.29-x64",
+    "android.29",
+    "android.28-x64",
+    "android.28",
+    "android.27-x64",
+    "android.27",
+    "android.26-x64",
+    "android.26",
+    "android.25-x64",
+    "android.25",
+    "android.24-x64",
+    "android.24",
+    "android.23-x64",
+    "android.23",
+    "android.22-x64",
+    "android.22",
+    "android.21-x64",
+    "android.21",
+    "android-x64",
+    "android",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "android.32-x86": [
+    "android.32-x86",
+    "android.32",
+    "android.31-x86",
+    "android.31",
+    "android.30-x86",
+    "android.30",
+    "android.29-x86",
+    "android.29",
+    "android.28-x86",
+    "android.28",
+    "android.27-x86",
+    "android.27",
+    "android.26-x86",
+    "android.26",
+    "android.25-x86",
+    "android.25",
+    "android.24-x86",
+    "android.24",
+    "android.23-x86",
+    "android.23",
+    "android.22-x86",
+    "android.22",
+    "android.21-x86",
+    "android.21",
+    "android-x86",
+    "android",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
   "any": [
     "any",
     "base"
@@ -6370,6 +6525,78 @@
     "any",
     "base"
   ],
+  "osx.13": [
+    "osx.13",
+    "osx.12",
+    "osx.11.0",
+    "osx.10.16",
+    "osx.10.15",
+    "osx.10.14",
+    "osx.10.13",
+    "osx.10.12",
+    "osx.10.11",
+    "osx.10.10",
+    "osx",
+    "unix",
+    "any",
+    "base"
+  ],
+  "osx.13-arm64": [
+    "osx.13-arm64",
+    "osx.13",
+    "osx.12-arm64",
+    "osx.12",
+    "osx.11.0-arm64",
+    "osx.11.0",
+    "osx.10.16-arm64",
+    "osx.10.16",
+    "osx.10.15-arm64",
+    "osx.10.15",
+    "osx.10.14-arm64",
+    "osx.10.14",
+    "osx.10.13-arm64",
+    "osx.10.13",
+    "osx.10.12-arm64",
+    "osx.10.12",
+    "osx.10.11-arm64",
+    "osx.10.11",
+    "osx.10.10-arm64",
+    "osx.10.10",
+    "osx-arm64",
+    "osx",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "osx.13-x64": [
+    "osx.13-x64",
+    "osx.13",
+    "osx.12-x64",
+    "osx.12",
+    "osx.11.0-x64",
+    "osx.11.0",
+    "osx.10.16-x64",
+    "osx.10.16",
+    "osx.10.15-x64",
+    "osx.10.15",
+    "osx.10.14-x64",
+    "osx.10.14",
+    "osx.10.13-x64",
+    "osx.10.13",
+    "osx.10.12-x64",
+    "osx.10.12",
+    "osx.10.11-x64",
+    "osx.10.11",
+    "osx.10.10-x64",
+    "osx.10.10",
+    "osx-x64",
+    "osx",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel": [
     "rhel",
     "linux",
@@ -9295,6 +9522,71 @@
     "any",
     "base"
   ],
+  "ubuntu.23.04": [
+    "ubuntu.23.04",
+    "ubuntu",
+    "debian",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.23.04-arm": [
+    "ubuntu.23.04-arm",
+    "ubuntu.23.04",
+    "ubuntu-arm",
+    "ubuntu",
+    "debian-arm",
+    "debian",
+    "linux-arm",
+    "linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.23.04-arm64": [
+    "ubuntu.23.04-arm64",
+    "ubuntu.23.04",
+    "ubuntu-arm64",
+    "ubuntu",
+    "debian-arm64",
+    "debian",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.23.04-x64": [
+    "ubuntu.23.04-x64",
+    "ubuntu.23.04",
+    "ubuntu-x64",
+    "ubuntu",
+    "debian-x64",
+    "debian",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ubuntu.23.04-x86": [
+    "ubuntu.23.04-x86",
+    "ubuntu.23.04",
+    "ubuntu-x86",
+    "ubuntu",
+    "debian-x86",
+    "debian",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
   "unix": [
     "unix",
     "any",
@@ -9972,4 +10264,4 @@
     "any",
     "base"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
index b1b0d9e4856592..40c007f61576ca 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -17,22 +17,22 @@
         "linux-musl-arm64"
       ]
     },
-    "alpine-x64": {
+    "alpine-s390x": {
       "#import": [
         "alpine",
-        "linux-musl-x64"
+        "linux-musl-s390x"
       ]
     },
-    "alpine-x86": {
+    "alpine-x64": {
       "#import": [
         "alpine",
-        "linux-musl-x86"
+        "linux-musl-x64"
       ]
     },
-    "alpine-s390x": {
+    "alpine-x86": {
       "#import": [
         "alpine",
-        "linux-musl-s390x"
+        "linux-musl-x86"
       ]
     },
     "alpine.3.10": {
@@ -52,22 +52,22 @@
         "alpine.3.9-arm64"
       ]
     },
-    "alpine.3.10-x64": {
+    "alpine.3.10-s390x": {
       "#import": [
         "alpine.3.10",
-        "alpine.3.9-x64"
+        "alpine.3.9-s390x"
       ]
     },
-    "alpine.3.10-x86": {
+    "alpine.3.10-x64": {
       "#import": [
         "alpine.3.10",
-        "alpine.3.9-x86"
+        "alpine.3.9-x64"
       ]
     },
-    "alpine.3.10-s390x": {
+    "alpine.3.10-x86": {
       "#import": [
         "alpine.3.10",
-        "alpine.3.9-s390x"
+        "alpine.3.9-x86"
       ]
     },
     "alpine.3.11": {
@@ -87,22 +87,22 @@
         "alpine.3.10-arm64"
       ]
     },
-    "alpine.3.11-x64": {
+    "alpine.3.11-s390x": {
       "#import": [
         "alpine.3.11",
-        "alpine.3.10-x64"
+        "alpine.3.10-s390x"
       ]
     },
-    "alpine.3.11-x86": {
+    "alpine.3.11-x64": {
       "#import": [
         "alpine.3.11",
-        "alpine.3.10-x86"
+        "alpine.3.10-x64"
       ]
     },
-    "alpine.3.11-s390x": {
+    "alpine.3.11-x86": {
       "#import": [
         "alpine.3.11",
-        "alpine.3.10-s390x"
+        "alpine.3.10-x86"
       ]
     },
     "alpine.3.12": {
@@ -122,22 +122,22 @@
         "alpine.3.11-arm64"
       ]
     },
-    "alpine.3.12-x64": {
+    "alpine.3.12-s390x": {
       "#import": [
         "alpine.3.12",
-        "alpine.3.11-x64"
+        "alpine.3.11-s390x"
       ]
     },
-    "alpine.3.12-x86": {
+    "alpine.3.12-x64": {
       "#import": [
         "alpine.3.12",
-        "alpine.3.11-x86"
+        "alpine.3.11-x64"
       ]
     },
-    "alpine.3.12-s390x": {
+    "alpine.3.12-x86": {
       "#import": [
         "alpine.3.12",
-        "alpine.3.11-s390x"
+        "alpine.3.11-x86"
       ]
     },
     "alpine.3.13": {
@@ -157,22 +157,22 @@
         "alpine.3.12-arm64"
       ]
     },
-    "alpine.3.13-x64": {
+    "alpine.3.13-s390x": {
       "#import": [
         "alpine.3.13",
-        "alpine.3.12-x64"
+        "alpine.3.12-s390x"
       ]
     },
-    "alpine.3.13-x86": {
+    "alpine.3.13-x64": {
       "#import": [
         "alpine.3.13",
-        "alpine.3.12-x86"
+        "alpine.3.12-x64"
       ]
     },
-    "alpine.3.13-s390x": {
+    "alpine.3.13-x86": {
       "#import": [
         "alpine.3.13",
-        "alpine.3.12-s390x"
+        "alpine.3.12-x86"
       ]
     },
     "alpine.3.14": {
@@ -192,22 +192,22 @@
         "alpine.3.13-arm64"
       ]
     },
-    "alpine.3.14-x64": {
+    "alpine.3.14-s390x": {
       "#import": [
         "alpine.3.14",
-        "alpine.3.13-x64"
+        "alpine.3.13-s390x"
       ]
     },
-    "alpine.3.14-x86": {
+    "alpine.3.14-x64": {
       "#import": [
         "alpine.3.14",
-        "alpine.3.13-x86"
+        "alpine.3.13-x64"
       ]
     },
-    "alpine.3.14-s390x": {
+    "alpine.3.14-x86": {
       "#import": [
         "alpine.3.14",
-        "alpine.3.13-s390x"
+        "alpine.3.13-x86"
       ]
     },
     "alpine.3.15": {
@@ -227,22 +227,22 @@
         "alpine.3.14-arm64"
       ]
     },
-    "alpine.3.15-x64": {
+    "alpine.3.15-s390x": {
       "#import": [
         "alpine.3.15",
-        "alpine.3.14-x64"
+        "alpine.3.14-s390x"
       ]
     },
-    "alpine.3.15-x86": {
+    "alpine.3.15-x64": {
       "#import": [
         "alpine.3.15",
-        "alpine.3.14-x86"
+        "alpine.3.14-x64"
       ]
     },
-    "alpine.3.15-s390x": {
+    "alpine.3.15-x86": {
       "#import": [
         "alpine.3.15",
-        "alpine.3.14-s390x"
+        "alpine.3.14-x86"
       ]
     },
     "alpine.3.16": {
@@ -262,22 +262,22 @@
         "alpine.3.15-arm64"
       ]
     },
-    "alpine.3.16-x64": {
+    "alpine.3.16-s390x": {
       "#import": [
         "alpine.3.16",
-        "alpine.3.15-x64"
+        "alpine.3.15-s390x"
       ]
     },
-    "alpine.3.16-x86": {
+    "alpine.3.16-x64": {
       "#import": [
         "alpine.3.16",
-        "alpine.3.15-x86"
+        "alpine.3.15-x64"
       ]
     },
-    "alpine.3.16-s390x": {
+    "alpine.3.16-x86": {
       "#import": [
         "alpine.3.16",
-        "alpine.3.15-s390x"
+        "alpine.3.15-x86"
       ]
     },
     "alpine.3.17": {
@@ -297,22 +297,22 @@
         "alpine.3.16-arm64"
       ]
     },
-    "alpine.3.17-x64": {
+    "alpine.3.17-s390x": {
       "#import": [
         "alpine.3.17",
-        "alpine.3.16-x64"
+        "alpine.3.16-s390x"
       ]
     },
-    "alpine.3.17-x86": {
+    "alpine.3.17-x64": {
       "#import": [
         "alpine.3.17",
-        "alpine.3.16-x86"
+        "alpine.3.16-x64"
       ]
     },
-    "alpine.3.17-s390x": {
+    "alpine.3.17-x86": {
       "#import": [
         "alpine.3.17",
-        "alpine.3.16-s390x"
+        "alpine.3.16-x86"
       ]
     },
     "alpine.3.6": {
@@ -332,22 +332,22 @@
         "alpine-arm64"
       ]
     },
-    "alpine.3.6-x64": {
+    "alpine.3.6-s390x": {
       "#import": [
         "alpine.3.6",
-        "alpine-x64"
+        "alpine-s390x"
       ]
     },
-    "alpine.3.6-x86": {
+    "alpine.3.6-x64": {
       "#import": [
         "alpine.3.6",
-        "alpine-x86"
+        "alpine-x64"
       ]
     },
-    "alpine.3.6-s390x": {
+    "alpine.3.6-x86": {
       "#import": [
         "alpine.3.6",
-        "alpine-s390x"
+        "alpine-x86"
       ]
     },
     "alpine.3.7": {
@@ -367,22 +367,22 @@
         "alpine.3.6-arm64"
       ]
     },
-    "alpine.3.7-x64": {
+    "alpine.3.7-s390x": {
       "#import": [
         "alpine.3.7",
-        "alpine.3.6-x64"
+        "alpine.3.6-s390x"
       ]
     },
-    "alpine.3.7-x86": {
+    "alpine.3.7-x64": {
       "#import": [
         "alpine.3.7",
-        "alpine.3.6-x86"
+        "alpine.3.6-x64"
       ]
     },
-    "alpine.3.7-s390x": {
+    "alpine.3.7-x86": {
       "#import": [
         "alpine.3.7",
-        "alpine.3.6-s390x"
+        "alpine.3.6-x86"
       ]
     },
     "alpine.3.8": {
@@ -402,22 +402,22 @@
         "alpine.3.7-arm64"
       ]
     },
-    "alpine.3.8-x64": {
+    "alpine.3.8-s390x": {
       "#import": [
         "alpine.3.8",
-        "alpine.3.7-x64"
+        "alpine.3.7-s390x"
       ]
     },
-    "alpine.3.8-x86": {
+    "alpine.3.8-x64": {
       "#import": [
         "alpine.3.8",
-        "alpine.3.7-x86"
+        "alpine.3.7-x64"
       ]
     },
-    "alpine.3.8-s390x": {
+    "alpine.3.8-x86": {
       "#import": [
         "alpine.3.8",
-        "alpine.3.7-s390x"
+        "alpine.3.7-x86"
       ]
     },
     "alpine.3.9": {
@@ -437,22 +437,22 @@
         "alpine.3.8-arm64"
       ]
     },
-    "alpine.3.9-x64": {
+    "alpine.3.9-s390x": {
       "#import": [
         "alpine.3.9",
-        "alpine.3.8-x64"
+        "alpine.3.8-s390x"
       ]
     },
-    "alpine.3.9-x86": {
+    "alpine.3.9-x64": {
       "#import": [
         "alpine.3.9",
-        "alpine.3.8-x86"
+        "alpine.3.8-x64"
       ]
     },
-    "alpine.3.9-s390x": {
+    "alpine.3.9-x86": {
       "#import": [
         "alpine.3.9",
-        "alpine.3.8-s390x"
+        "alpine.3.8-x86"
       ]
     },
     "android": {
@@ -803,6 +803,35 @@
         "android.30-x86"
       ]
     },
+    "android.32": {
+      "#import": [
+        "android.31"
+      ]
+    },
+    "android.32-arm": {
+      "#import": [
+        "android.32",
+        "android.31-arm"
+      ]
+    },
+    "android.32-arm64": {
+      "#import": [
+        "android.32",
+        "android.31-arm64"
+      ]
+    },
+    "android.32-x64": {
+      "#import": [
+        "android.32",
+        "android.31-x64"
+      ]
+    },
+    "android.32-x86": {
+      "#import": [
+        "android.32",
+        "android.31-x86"
+      ]
+    },
     "any": {
       "#import": [
         "base"
@@ -2420,6 +2449,23 @@
         "osx.11.0-x64"
       ]
     },
+    "osx.13": {
+      "#import": [
+        "osx.12"
+      ]
+    },
+    "osx.13-arm64": {
+      "#import": [
+        "osx.13",
+        "osx.12-arm64"
+      ]
+    },
+    "osx.13-x64": {
+      "#import": [
+        "osx.13",
+        "osx.12-x64"
+      ]
+    },
     "rhel": {
       "#import": [
         "linux"
@@ -3701,6 +3747,35 @@
         "ubuntu-x86"
       ]
     },
+    "ubuntu.23.04": {
+      "#import": [
+        "ubuntu"
+      ]
+    },
+    "ubuntu.23.04-arm": {
+      "#import": [
+        "ubuntu.23.04",
+        "ubuntu-arm"
+      ]
+    },
+    "ubuntu.23.04-arm64": {
+      "#import": [
+        "ubuntu.23.04",
+        "ubuntu-arm64"
+      ]
+    },
+    "ubuntu.23.04-x64": {
+      "#import": [
+        "ubuntu.23.04",
+        "ubuntu-x64"
+      ]
+    },
+    "ubuntu.23.04-x86": {
+      "#import": [
+        "ubuntu.23.04",
+        "ubuntu-x86"
+      ]
+    },
     "unix": {
       "#import": [
         "any"
@@ -4065,4 +4140,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
index b54f07c0a1f9f7..3de83acbcb1478 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -22,7 +22,7 @@
     <RuntimeGroup Include="android">
       <Parent>linux</Parent>
       <Architectures>x64;x86;arm;arm64</Architectures>
-      <Versions>21;22;23;24;25;26;27;28;29;30;31</Versions>
+      <Versions>21;22;23;24;25;26;27;28;29;30;31;32</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="arch">
@@ -155,7 +155,7 @@
     <RuntimeGroup Include="osx">
       <Parent>unix</Parent>
       <Architectures>x64;arm64</Architectures>
-      <Versions>10.10;10.11;10.12;10.13;10.14;10.15;10.16;11.0;12</Versions>
+      <Versions>10.10;10.11;10.12;10.13;10.14;10.15;10.16;11.0;12;13</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="freebsd">
@@ -244,7 +244,7 @@
     <RuntimeGroup Include="ubuntu">
       <Parent>debian</Parent>
       <Architectures>x64;x86;arm;arm64</Architectures>
-      <Versions>16.04;16.10;17.04;17.10;18.04;18.10;19.04;19.10;20.04;20.10;21.04;21.10;22.04</Versions>
+      <Versions>16.04;16.10;17.04;17.10;18.04;18.10;19.04;19.10;20.04;20.10;21.04;21.10;22.04;23.04</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>
 
diff --git a/src/libraries/Microsoft.NETCore.Platforms/tests/GenerateRuntimeGraphTests.cs b/src/libraries/Microsoft.NETCore.Platforms/tests/GenerateRuntimeGraphTests.cs
index 53bc785e09deee..ed8e8b281409ab 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/tests/GenerateRuntimeGraphTests.cs
+++ b/src/libraries/Microsoft.NETCore.Platforms/tests/GenerateRuntimeGraphTests.cs
@@ -196,14 +196,15 @@ public void CanAddArchitectureToExistingGroups()
         [Fact]
         public void CanAddArchitectureAndVersionToExistingGroups()
         {
-            var additionalRIDs = new[] { "osx.12-powerpc" };
+            var additionalRIDs = new[] { "osx.13-powerpc" };
             var expectedAdditions = new[]
             {
-                new RuntimeDescription("osx.12-powerpc", new[] { "osx.12", "osx.11.0-powerpc" }),
-                new RuntimeDescription("osx.12-arm64", new[] { "osx.12", "osx.11.0-arm64" }),
-                new RuntimeDescription("osx.12-x64", new[] { "osx.12", "osx.11.0-x64" }),
-                new RuntimeDescription("osx.12", new[] { "osx.11.0" }),
+                new RuntimeDescription("osx.13-powerpc", new[] { "osx.13", "osx.12-powerpc" }),
+                new RuntimeDescription("osx.13-arm64", new[] { "osx.13", "osx.12-arm64" }),
+                new RuntimeDescription("osx.13-x64", new[] { "osx.13", "osx.12-x64" }),
+                new RuntimeDescription("osx.13", new[] { "osx.12" }),
                 // our RID model doesn't give priority to architecture, so the new architecture is applied to all past versions
+                new RuntimeDescription("osx.12-powerpc", new[] { "osx.12", "osx.11.0-powerpc" }),
                 new RuntimeDescription("osx.11.0-powerpc", new[] { "osx.11.0", "osx.10.16-powerpc" }),
                 new RuntimeDescription("osx.10.16-powerpc", new[] { "osx.10.16", "osx.10.15-powerpc" }),
                 new RuntimeDescription("osx.10.15-powerpc", new[] { "osx.10.15", "osx.10.14-powerpc" }),