From af642462178b2be02f628f58ee388cb335cf91d8 Mon Sep 17 00:00:00 2001
From: Antoine Martin <dev@ayakael.net>
Date: Fri, 16 Sep 2022 14:30:14 -0400
Subject: [PATCH] Add RID for alpine-3.17 + alpine-{x86,s390x} (backports
 #75396) (#75530)

---
 .../src/runtime.compatibility.json            | 760 +++++++++++++++++-
 .../src/runtime.json                          | 181 ++++-
 .../src/runtimeGroups.props                   |   4 +-
 3 files changed, 938 insertions(+), 7 deletions(-)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index 09df206a8ca0c..627fb378de8a9 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -43,6 +43,30 @@
     "any",
     "base"
   ],
+  "alpine-x86": [
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -122,6 +146,50 @@
     "any",
     "base"
   ],
+  "alpine.3.10-x86": [
+    "alpine.3.10-x86",
+    "alpine.3.10",
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -208,6 +276,54 @@
     "any",
     "base"
   ],
+  "alpine.3.11-x86": [
+    "alpine.3.11-x86",
+    "alpine.3.11",
+    "alpine.3.10-x86",
+    "alpine.3.10",
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -301,6 +417,58 @@
     "any",
     "base"
   ],
+  "alpine.3.12-x86": [
+    "alpine.3.12-x86",
+    "alpine.3.12",
+    "alpine.3.11-x86",
+    "alpine.3.11",
+    "alpine.3.10-x86",
+    "alpine.3.10",
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -401,6 +569,62 @@
     "any",
     "base"
   ],
+  "alpine.3.13-x86": [
+    "alpine.3.13-x86",
+    "alpine.3.13",
+    "alpine.3.12-x86",
+    "alpine.3.12",
+    "alpine.3.11-x86",
+    "alpine.3.11",
+    "alpine.3.10-x86",
+    "alpine.3.10",
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -508,6 +732,66 @@
     "any",
     "base"
   ],
+  "alpine.3.14-x86": [
+    "alpine.3.14-x86",
+    "alpine.3.14",
+    "alpine.3.13-x86",
+    "alpine.3.13",
+    "alpine.3.12-x86",
+    "alpine.3.12",
+    "alpine.3.11-x86",
+    "alpine.3.11",
+    "alpine.3.10-x86",
+    "alpine.3.10",
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -622,6 +906,70 @@
     "any",
     "base"
   ],
+  "alpine.3.15-x86": [
+    "alpine.3.15-x86",
+    "alpine.3.15",
+    "alpine.3.14-x86",
+    "alpine.3.14",
+    "alpine.3.13-x86",
+    "alpine.3.13",
+    "alpine.3.12-x86",
+    "alpine.3.12",
+    "alpine.3.11-x86",
+    "alpine.3.11",
+    "alpine.3.10-x86",
+    "alpine.3.10",
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -743,17 +1091,285 @@
     "any",
     "base"
   ],
-  "alpine.3.6": [
+  "alpine.3.16-x86": [
+    "alpine.3.16-x86",
+    "alpine.3.16",
+    "alpine.3.15-x86",
+    "alpine.3.15",
+    "alpine.3.14-x86",
+    "alpine.3.14",
+    "alpine.3.13-x86",
+    "alpine.3.13",
+    "alpine.3.12-x86",
+    "alpine.3.12",
+    "alpine.3.11-x86",
+    "alpine.3.11",
+    "alpine.3.10-x86",
+    "alpine.3.10",
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
     "alpine.3.6",
+    "alpine-x86",
     "alpine",
+    "linux-musl-x86",
     "linux-musl",
+    "linux-x86",
     "linux",
+    "unix-x86",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.6-arm": [
-    "alpine.3.6-arm",
+  "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",
+    "alpine.3.15",
+    "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.17-arm": [
+    "alpine.3.17-arm",
+    "alpine.3.17",
+    "alpine.3.16-arm",
+    "alpine.3.16",
+    "alpine.3.15-arm",
+    "alpine.3.15",
+    "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.17-arm64": [
+    "alpine.3.17-arm64",
+    "alpine.3.17",
+    "alpine.3.16-arm64",
+    "alpine.3.16",
+    "alpine.3.15-arm64",
+    "alpine.3.15",
+    "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.17-x64": [
+    "alpine.3.17-x64",
+    "alpine.3.17",
+    "alpine.3.16-x64",
+    "alpine.3.16",
+    "alpine.3.15-x64",
+    "alpine.3.15",
+    "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.17-x86": [
+    "alpine.3.17-x86",
+    "alpine.3.17",
+    "alpine.3.16-x86",
+    "alpine.3.16",
+    "alpine.3.15-x86",
+    "alpine.3.15",
+    "alpine.3.14-x86",
+    "alpine.3.14",
+    "alpine.3.13-x86",
+    "alpine.3.13",
+    "alpine.3.12-x86",
+    "alpine.3.12",
+    "alpine.3.11-x86",
+    "alpine.3.11",
+    "alpine.3.10-x86",
+    "alpine.3.10",
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
+    "linux-musl",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine.3.6-arm": [
+    "alpine.3.6-arm",
     "alpine.3.6",
     "alpine-arm",
     "alpine",
@@ -794,6 +1410,34 @@
     "any",
     "base"
   ],
+  "alpine.3.6-x86": [
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -852,6 +1496,38 @@
     "any",
     "base"
   ],
+  "alpine.3.7-x86": [
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -917,6 +1593,42 @@
     "any",
     "base"
   ],
+  "alpine.3.8-x86": [
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -989,6 +1701,46 @@
     "any",
     "base"
   ],
+  "alpine.3.9-x86": [
+    "alpine.3.9-x86",
+    "alpine.3.9",
+    "alpine.3.8-x86",
+    "alpine.3.8",
+    "alpine.3.7-x86",
+    "alpine.3.7",
+    "alpine.3.6-x86",
+    "alpine.3.6",
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "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",
@@ -9069,4 +9821,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 fc08ee78a84dd..9d170500407e0 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -23,6 +23,18 @@
         "linux-musl-x64"
       ]
     },
+    "alpine-x86": {
+      "#import": [
+        "alpine",
+        "linux-musl-x86"
+      ]
+    },
+    "alpine-s390x": {
+      "#import": [
+        "alpine",
+        "linux-musl-s390x"
+      ]
+    },
     "alpine.3.10": {
       "#import": [
         "alpine.3.9"
@@ -46,6 +58,18 @@
         "alpine.3.9-x64"
       ]
     },
+    "alpine.3.10-x86": {
+      "#import": [
+        "alpine.3.10",
+        "alpine.3.9-x86"
+      ]
+    },
+    "alpine.3.10-s390x": {
+      "#import": [
+        "alpine.3.10",
+        "alpine.3.9-s390x"
+      ]
+    },
     "alpine.3.11": {
       "#import": [
         "alpine.3.10"
@@ -69,6 +93,18 @@
         "alpine.3.10-x64"
       ]
     },
+    "alpine.3.11-x86": {
+      "#import": [
+        "alpine.3.11",
+        "alpine.3.10-x86"
+      ]
+    },
+    "alpine.3.11-s390x": {
+      "#import": [
+        "alpine.3.11",
+        "alpine.3.10-s390x"
+      ]
+    },
     "alpine.3.12": {
       "#import": [
         "alpine.3.11"
@@ -92,6 +128,18 @@
         "alpine.3.11-x64"
       ]
     },
+    "alpine.3.12-x86": {
+      "#import": [
+        "alpine.3.12",
+        "alpine.3.11-x86"
+      ]
+    },
+    "alpine.3.12-s390x": {
+      "#import": [
+        "alpine.3.12",
+        "alpine.3.11-s390x"
+      ]
+    },
     "alpine.3.13": {
       "#import": [
         "alpine.3.12"
@@ -115,6 +163,18 @@
         "alpine.3.12-x64"
       ]
     },
+    "alpine.3.13-x86": {
+      "#import": [
+        "alpine.3.13",
+        "alpine.3.12-x86"
+      ]
+    },
+    "alpine.3.13-s390x": {
+      "#import": [
+        "alpine.3.13",
+        "alpine.3.12-s390x"
+      ]
+    },
     "alpine.3.14": {
       "#import": [
         "alpine.3.13"
@@ -138,6 +198,18 @@
         "alpine.3.13-x64"
       ]
     },
+    "alpine.3.14-x86": {
+      "#import": [
+        "alpine.3.14",
+        "alpine.3.13-x86"
+      ]
+    },
+    "alpine.3.14-s390x": {
+      "#import": [
+        "alpine.3.14",
+        "alpine.3.13-s390x"
+      ]
+    },
     "alpine.3.15": {
       "#import": [
         "alpine.3.14"
@@ -161,6 +233,18 @@
         "alpine.3.14-x64"
       ]
     },
+    "alpine.3.15-x86": {
+      "#import": [
+        "alpine.3.15",
+        "alpine.3.14-x86"
+      ]
+    },
+    "alpine.3.15-s390x": {
+      "#import": [
+        "alpine.3.15",
+        "alpine.3.14-s390x"
+      ]
+    },
     "alpine.3.16": {
       "#import": [
         "alpine.3.15"
@@ -184,6 +268,53 @@
         "alpine.3.15-x64"
       ]
     },
+    "alpine.3.16-x86": {
+      "#import": [
+        "alpine.3.16",
+        "alpine.3.15-x86"
+      ]
+    },
+    "alpine.3.16-s390x": {
+      "#import": [
+        "alpine.3.16",
+        "alpine.3.15-s390x"
+      ]
+    },
+    "alpine.3.17": {
+      "#import": [
+        "alpine.3.16"
+      ]
+    },
+    "alpine.3.17-arm": {
+      "#import": [
+        "alpine.3.17",
+        "alpine.3.16-arm"
+      ]
+    },
+    "alpine.3.17-arm64": {
+      "#import": [
+        "alpine.3.17",
+        "alpine.3.16-arm64"
+      ]
+    },
+    "alpine.3.17-x64": {
+      "#import": [
+        "alpine.3.17",
+        "alpine.3.16-x64"
+      ]
+    },
+    "alpine.3.17-x86": {
+      "#import": [
+        "alpine.3.17",
+        "alpine.3.16-x86"
+      ]
+    },
+    "alpine.3.17-s390x": {
+      "#import": [
+        "alpine.3.17",
+        "alpine.3.16-s390x"
+      ]
+    },
     "alpine.3.6": {
       "#import": [
         "alpine"
@@ -207,6 +338,18 @@
         "alpine-x64"
       ]
     },
+    "alpine.3.6-x86": {
+      "#import": [
+        "alpine.3.6",
+        "alpine-x86"
+      ]
+    },
+    "alpine.3.6-s390x": {
+      "#import": [
+        "alpine.3.6",
+        "alpine-s390x"
+      ]
+    },
     "alpine.3.7": {
       "#import": [
         "alpine.3.6"
@@ -230,6 +373,18 @@
         "alpine.3.6-x64"
       ]
     },
+    "alpine.3.7-x86": {
+      "#import": [
+        "alpine.3.7",
+        "alpine.3.6-x86"
+      ]
+    },
+    "alpine.3.7-s390x": {
+      "#import": [
+        "alpine.3.7",
+        "alpine.3.6-s390x"
+      ]
+    },
     "alpine.3.8": {
       "#import": [
         "alpine.3.7"
@@ -253,6 +408,18 @@
         "alpine.3.7-x64"
       ]
     },
+    "alpine.3.8-x86": {
+      "#import": [
+        "alpine.3.8",
+        "alpine.3.7-x86"
+      ]
+    },
+    "alpine.3.8-s390x": {
+      "#import": [
+        "alpine.3.8",
+        "alpine.3.7-s390x"
+      ]
+    },
     "alpine.3.9": {
       "#import": [
         "alpine.3.8"
@@ -276,6 +443,18 @@
         "alpine.3.8-x64"
       ]
     },
+    "alpine.3.9-x86": {
+      "#import": [
+        "alpine.3.9",
+        "alpine.3.8-x86"
+      ]
+    },
+    "alpine.3.9-s390x": {
+      "#import": [
+        "alpine.3.9",
+        "alpine.3.8-s390x"
+      ]
+    },
     "android": {
       "#import": [
         "linux"
@@ -3840,4 +4019,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 8534909568ab9..d38bda7f58c3e 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -15,8 +15,8 @@
 
     <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;3.14;3.15;3.16</Versions>
+      <Architectures>x64;x86;arm;arm64;s390x</Architectures>
+      <Versions>3.6;3.7;3.8;3.9;3.10;3.11;3.12;3.13;3.14;3.15;3.16;3.17</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="android">