From bc7b4dd647566eb4709ac74a93a0129ecb6ddc3b Mon Sep 17 00:00:00 2001
From: wfurt <tweinfurt@yahoo.com>
Date: Thu, 16 Feb 2023 22:43:37 -0800
Subject: [PATCH 1/2] add RID for Ubuntu 23.04

---
 .../src/runtime.compatibility.json            | 1671 +++++++++--------
 .../src/runtime.json                          |  397 ++--
 .../src/runtimeGroups.props                   |    2 +-
 3 files changed, 1082 insertions(+), 988 deletions(-)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index 926d654022362..0275cfbf45475 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -19,18 +19,6 @@
     "any",
     "base"
   ],
-  "alpine-armv6": [
-    "alpine-armv6",
-    "alpine",
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine-arm64": [
     "alpine-arm64",
     "alpine",
@@ -43,26 +31,26 @@
     "any",
     "base"
   ],
-  "alpine-x64": [
-    "alpine-x64",
+  "alpine-armv6": [
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine-x86": [
-    "alpine-x86",
+  "alpine-ppc64le": [
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -79,14 +67,26 @@
     "any",
     "base"
   ],
-  "alpine-ppc64le": [
-    "alpine-ppc64le",
+  "alpine-x64": [
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine-x86": [
+    "alpine-x86",
+    "alpine",
+    "linux-musl-x86",
+    "linux-musl",
+    "linux-x86",
+    "linux",
+    "unix-x86",
     "unix",
     "any",
     "base"
@@ -126,28 +126,6 @@
     "any",
     "base"
   ],
-  "alpine.3.10-armv6": [
-    "alpine.3.10-armv6",
-    "alpine.3.10",
-    "alpine.3.9-armv6",
-    "alpine.3.9",
-    "alpine.3.8-armv6",
-    "alpine.3.8",
-    "alpine.3.7-armv6",
-    "alpine.3.7",
-    "alpine.3.6-armv6",
-    "alpine.3.6",
-    "alpine-armv6",
-    "alpine",
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.10-arm64": [
     "alpine.3.10-arm64",
     "alpine.3.10",
@@ -170,46 +148,46 @@
     "any",
     "base"
   ],
-  "alpine.3.10-x64": [
-    "alpine.3.10-x64",
+  "alpine.3.10-armv6": [
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-x64",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-x64",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-x64",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.10-x86": [
-    "alpine.3.10-x86",
+  "alpine.3.10-ppc64le": [
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-x86",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-x86",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-x86",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -236,24 +214,46 @@
     "any",
     "base"
   ],
-  "alpine.3.10-ppc64le": [
-    "alpine.3.10-ppc64le",
+  "alpine.3.10-x64": [
+    "alpine.3.10-x64",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-x64",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-x64",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-x64",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
+    "unix",
+    "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"
@@ -296,6 +296,30 @@
     "any",
     "base"
   ],
+  "alpine.3.11-arm64": [
+    "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.11-armv6": [
     "alpine.3.11-armv6",
     "alpine.3.11",
@@ -320,26 +344,50 @@
     "any",
     "base"
   ],
-  "alpine.3.11-arm64": [
-    "alpine.3.11-arm64",
+  "alpine.3.11-ppc64le": [
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-arm64",
+    "linux-ppc64le",
     "linux",
-    "unix-arm64",
+    "unix-ppc64le",
+    "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"
@@ -392,143 +440,147 @@
     "any",
     "base"
   ],
-  "alpine.3.11-s390x": [
-    "alpine.3.11-s390x",
+  "alpine.3.12": [
+    "alpine.3.12",
     "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-ppc64le": [
-    "alpine.3.11-ppc64le",
+  "alpine.3.12-arm": [
+    "alpine.3.12-arm",
+    "alpine.3.12",
+    "alpine.3.11-arm",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-arm",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-arm",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-arm",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-arm",
     "linux",
-    "unix-ppc64le",
+    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.12": [
+  "alpine.3.12-arm64": [
+    "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.12-arm": [
-    "alpine.3.12-arm",
+  "alpine.3.12-armv6": [
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-arm",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-arm",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-arm",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-arm",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-arm",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-arm",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-arm",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-arm",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-arm",
+    "linux-armv6",
     "linux",
-    "unix-arm",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.12-armv6": [
-    "alpine.3.12-armv6",
+  "alpine.3.12-ppc64le": [
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-armv6",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-armv6",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-armv6",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-armv6",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-armv6",
+    "linux-ppc64le",
     "linux",
-    "unix-armv6",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.12-arm64": [
-    "alpine.3.12-arm64",
+  "alpine.3.12-s390x": [
+    "alpine.3.12-s390x",
     "alpine.3.12",
-    "alpine.3.11-arm64",
+    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-s390x",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-s390x",
     "linux-musl",
-    "linux-arm64",
+    "linux-s390x",
     "linux",
-    "unix-arm64",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -585,154 +637,158 @@
     "any",
     "base"
   ],
-  "alpine.3.12-s390x": [
-    "alpine.3.12-s390x",
+  "alpine.3.13": [
+    "alpine.3.13",
     "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-ppc64le": [
-    "alpine.3.12-ppc64le",
+  "alpine.3.13-arm": [
+    "alpine.3.13-arm",
+    "alpine.3.13",
+    "alpine.3.12-arm",
     "alpine.3.12",
-    "alpine.3.11-ppc64le",
+    "alpine.3.11-arm",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-arm",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-arm",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-arm",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-arm",
     "linux",
-    "unix-ppc64le",
+    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.13": [
+  "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-arm": [
-    "alpine.3.13-arm",
+  "alpine.3.13-armv6": [
+    "alpine.3.13-armv6",
     "alpine.3.13",
-    "alpine.3.12-arm",
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-arm",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-arm",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-arm",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-arm",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-arm",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-arm",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-arm",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-arm",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-arm",
+    "linux-armv6",
     "linux",
-    "unix-arm",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.13-armv6": [
-    "alpine.3.13-armv6",
+  "alpine.3.13-ppc64le": [
+    "alpine.3.13-ppc64le",
     "alpine.3.13",
-    "alpine.3.12-armv6",
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-armv6",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-armv6",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-armv6",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-armv6",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-armv6",
+    "linux-ppc64le",
     "linux",
-    "unix-armv6",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.13-arm64": [
-    "alpine.3.13-arm64",
+  "alpine.3.13-s390x": [
+    "alpine.3.13-s390x",
     "alpine.3.13",
-    "alpine.3.12-arm64",
+    "alpine.3.12-s390x",
     "alpine.3.12",
-    "alpine.3.11-arm64",
+    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-s390x",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-s390x",
     "linux-musl",
-    "linux-arm64",
+    "linux-s390x",
     "linux",
-    "unix-arm64",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -793,165 +849,169 @@
     "any",
     "base"
   ],
-  "alpine.3.13-s390x": [
-    "alpine.3.13-s390x",
+  "alpine.3.14": [
+    "alpine.3.14",
     "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-ppc64le": [
-    "alpine.3.13-ppc64le",
+  "alpine.3.14-arm": [
+    "alpine.3.14-arm",
+    "alpine.3.14",
+    "alpine.3.13-arm",
     "alpine.3.13",
-    "alpine.3.12-ppc64le",
+    "alpine.3.12-arm",
     "alpine.3.12",
-    "alpine.3.11-ppc64le",
+    "alpine.3.11-arm",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-arm",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-arm",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-arm",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-arm",
     "linux",
-    "unix-ppc64le",
+    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.14": [
+  "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-arm": [
-    "alpine.3.14-arm",
+  "alpine.3.14-armv6": [
+    "alpine.3.14-armv6",
     "alpine.3.14",
-    "alpine.3.13-arm",
+    "alpine.3.13-armv6",
     "alpine.3.13",
-    "alpine.3.12-arm",
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-arm",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-arm",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-arm",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-arm",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-arm",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-arm",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-arm",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-arm",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-arm",
+    "linux-armv6",
     "linux",
-    "unix-arm",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.14-armv6": [
-    "alpine.3.14-armv6",
+  "alpine.3.14-ppc64le": [
+    "alpine.3.14-ppc64le",
     "alpine.3.14",
-    "alpine.3.13-armv6",
+    "alpine.3.13-ppc64le",
     "alpine.3.13",
-    "alpine.3.12-armv6",
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-armv6",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-armv6",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-armv6",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-armv6",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-armv6",
+    "linux-ppc64le",
     "linux",
-    "unix-armv6",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.14-arm64": [
-    "alpine.3.14-arm64",
+  "alpine.3.14-s390x": [
+    "alpine.3.14-s390x",
     "alpine.3.14",
-    "alpine.3.13-arm64",
+    "alpine.3.13-s390x",
     "alpine.3.13",
-    "alpine.3.12-arm64",
+    "alpine.3.12-s390x",
     "alpine.3.12",
-    "alpine.3.11-arm64",
+    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-s390x",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-s390x",
     "linux-musl",
-    "linux-arm64",
+    "linux-s390x",
     "linux",
-    "unix-arm64",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -1016,176 +1076,180 @@
     "any",
     "base"
   ],
-  "alpine.3.14-s390x": [
-    "alpine.3.14-s390x",
+  "alpine.3.15": [
+    "alpine.3.15",
     "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-ppc64le": [
-    "alpine.3.14-ppc64le",
+  "alpine.3.15-arm": [
+    "alpine.3.15-arm",
+    "alpine.3.15",
+    "alpine.3.14-arm",
     "alpine.3.14",
-    "alpine.3.13-ppc64le",
+    "alpine.3.13-arm",
     "alpine.3.13",
-    "alpine.3.12-ppc64le",
+    "alpine.3.12-arm",
     "alpine.3.12",
-    "alpine.3.11-ppc64le",
+    "alpine.3.11-arm",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-arm",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-arm",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-arm",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-arm",
     "linux",
-    "unix-ppc64le",
+    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.15": [
+  "alpine.3.15-arm64": [
+    "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.15-arm": [
-    "alpine.3.15-arm",
+  "alpine.3.15-armv6": [
+    "alpine.3.15-armv6",
     "alpine.3.15",
-    "alpine.3.14-arm",
+    "alpine.3.14-armv6",
     "alpine.3.14",
-    "alpine.3.13-arm",
+    "alpine.3.13-armv6",
     "alpine.3.13",
-    "alpine.3.12-arm",
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-arm",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-arm",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-arm",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-arm",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-arm",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-arm",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-arm",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-arm",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-arm",
+    "linux-armv6",
     "linux",
-    "unix-arm",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.15-armv6": [
-    "alpine.3.15-armv6",
+  "alpine.3.15-ppc64le": [
+    "alpine.3.15-ppc64le",
     "alpine.3.15",
-    "alpine.3.14-armv6",
+    "alpine.3.14-ppc64le",
     "alpine.3.14",
-    "alpine.3.13-armv6",
+    "alpine.3.13-ppc64le",
     "alpine.3.13",
-    "alpine.3.12-armv6",
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-armv6",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-armv6",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-armv6",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-armv6",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-armv6",
+    "linux-ppc64le",
     "linux",
-    "unix-armv6",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.15-arm64": [
-    "alpine.3.15-arm64",
+  "alpine.3.15-s390x": [
+    "alpine.3.15-s390x",
     "alpine.3.15",
-    "alpine.3.14-arm64",
+    "alpine.3.14-s390x",
     "alpine.3.14",
-    "alpine.3.13-arm64",
+    "alpine.3.13-s390x",
     "alpine.3.13",
-    "alpine.3.12-arm64",
+    "alpine.3.12-s390x",
     "alpine.3.12",
-    "alpine.3.11-arm64",
+    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-s390x",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-s390x",
     "linux-musl",
-    "linux-arm64",
+    "linux-s390x",
     "linux",
-    "unix-arm64",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -1254,187 +1318,191 @@
     "any",
     "base"
   ],
-  "alpine.3.15-s390x": [
-    "alpine.3.15-s390x",
+  "alpine.3.16": [
+    "alpine.3.16",
     "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-ppc64le": [
-    "alpine.3.15-ppc64le",
+  "alpine.3.16-arm": [
+    "alpine.3.16-arm",
+    "alpine.3.16",
+    "alpine.3.15-arm",
     "alpine.3.15",
-    "alpine.3.14-ppc64le",
+    "alpine.3.14-arm",
     "alpine.3.14",
-    "alpine.3.13-ppc64le",
+    "alpine.3.13-arm",
     "alpine.3.13",
-    "alpine.3.12-ppc64le",
+    "alpine.3.12-arm",
     "alpine.3.12",
-    "alpine.3.11-ppc64le",
+    "alpine.3.11-arm",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-arm",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-arm",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-arm",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-arm",
     "linux",
-    "unix-ppc64le",
+    "unix-arm",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.16": [
+  "alpine.3.16-arm64": [
+    "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.16-arm": [
-    "alpine.3.16-arm",
+  "alpine.3.16-armv6": [
+    "alpine.3.16-armv6",
     "alpine.3.16",
-    "alpine.3.15-arm",
+    "alpine.3.15-armv6",
     "alpine.3.15",
-    "alpine.3.14-arm",
+    "alpine.3.14-armv6",
     "alpine.3.14",
-    "alpine.3.13-arm",
+    "alpine.3.13-armv6",
     "alpine.3.13",
-    "alpine.3.12-arm",
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-arm",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-arm",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-arm",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-arm",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-arm",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-arm",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-arm",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-arm",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-arm",
+    "linux-armv6",
     "linux",
-    "unix-arm",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.16-armv6": [
-    "alpine.3.16-armv6",
+  "alpine.3.16-ppc64le": [
+    "alpine.3.16-ppc64le",
     "alpine.3.16",
-    "alpine.3.15-armv6",
+    "alpine.3.15-ppc64le",
     "alpine.3.15",
-    "alpine.3.14-armv6",
+    "alpine.3.14-ppc64le",
     "alpine.3.14",
-    "alpine.3.13-armv6",
+    "alpine.3.13-ppc64le",
     "alpine.3.13",
-    "alpine.3.12-armv6",
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-armv6",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-armv6",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-armv6",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-armv6",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-armv6",
+    "linux-ppc64le",
     "linux",
-    "unix-armv6",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.16-arm64": [
-    "alpine.3.16-arm64",
+  "alpine.3.16-s390x": [
+    "alpine.3.16-s390x",
     "alpine.3.16",
-    "alpine.3.15-arm64",
+    "alpine.3.15-s390x",
     "alpine.3.15",
-    "alpine.3.14-arm64",
+    "alpine.3.14-s390x",
     "alpine.3.14",
-    "alpine.3.13-arm64",
+    "alpine.3.13-s390x",
     "alpine.3.13",
-    "alpine.3.12-arm64",
+    "alpine.3.12-s390x",
     "alpine.3.12",
-    "alpine.3.11-arm64",
+    "alpine.3.11-s390x",
     "alpine.3.11",
-    "alpine.3.10-arm64",
+    "alpine.3.10-s390x",
     "alpine.3.10",
-    "alpine.3.9-arm64",
+    "alpine.3.9-s390x",
     "alpine.3.9",
-    "alpine.3.8-arm64",
+    "alpine.3.8-s390x",
     "alpine.3.8",
-    "alpine.3.7-arm64",
+    "alpine.3.7-s390x",
     "alpine.3.7",
-    "alpine.3.6-arm64",
+    "alpine.3.6-s390x",
     "alpine.3.6",
-    "alpine-arm64",
+    "alpine-s390x",
     "alpine",
-    "linux-musl-arm64",
+    "linux-musl-s390x",
     "linux-musl",
-    "linux-arm64",
+    "linux-s390x",
     "linux",
-    "unix-arm64",
+    "unix-s390x",
     "unix",
     "any",
     "base"
@@ -1507,74 +1575,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.16-ppc64le": [
-    "alpine.3.16-ppc64le",
-    "alpine.3.16",
-    "alpine.3.15-ppc64le",
-    "alpine.3.15",
-    "alpine.3.14-ppc64le",
-    "alpine.3.14",
-    "alpine.3.13-ppc64le",
-    "alpine.3.13",
-    "alpine.3.12-ppc64le",
-    "alpine.3.12",
-    "alpine.3.11-ppc64le",
-    "alpine.3.11",
-    "alpine.3.10-ppc64le",
-    "alpine.3.10",
-    "alpine.3.9-ppc64le",
-    "alpine.3.9",
-    "alpine.3.8-ppc64le",
-    "alpine.3.8",
-    "alpine.3.7-ppc64le",
-    "alpine.3.7",
-    "alpine.3.6-ppc64le",
-    "alpine.3.6",
-    "alpine-ppc64le",
-    "alpine",
-    "linux-musl-ppc64le",
-    "linux-musl",
-    "linux-ppc64le",
-    "linux",
-    "unix-ppc64le",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.17": [
     "alpine.3.17",
     "alpine.3.16",
@@ -1631,42 +1631,6 @@
     "any",
     "base"
   ],
-  "alpine.3.17-armv6": [
-    "alpine.3.17-armv6",
-    "alpine.3.17",
-    "alpine.3.16-armv6",
-    "alpine.3.16",
-    "alpine.3.15-armv6",
-    "alpine.3.15",
-    "alpine.3.14-armv6",
-    "alpine.3.14",
-    "alpine.3.13-armv6",
-    "alpine.3.13",
-    "alpine.3.12-armv6",
-    "alpine.3.12",
-    "alpine.3.11-armv6",
-    "alpine.3.11",
-    "alpine.3.10-armv6",
-    "alpine.3.10",
-    "alpine.3.9-armv6",
-    "alpine.3.9",
-    "alpine.3.8-armv6",
-    "alpine.3.8",
-    "alpine.3.7-armv6",
-    "alpine.3.7",
-    "alpine.3.6-armv6",
-    "alpine.3.6",
-    "alpine-armv6",
-    "alpine",
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.17-arm64": [
     "alpine.3.17-arm64",
     "alpine.3.17",
@@ -1703,74 +1667,74 @@
     "any",
     "base"
   ],
-  "alpine.3.17-x64": [
-    "alpine.3.17-x64",
+  "alpine.3.17-armv6": [
+    "alpine.3.17-armv6",
     "alpine.3.17",
-    "alpine.3.16-x64",
+    "alpine.3.16-armv6",
     "alpine.3.16",
-    "alpine.3.15-x64",
+    "alpine.3.15-armv6",
     "alpine.3.15",
-    "alpine.3.14-x64",
+    "alpine.3.14-armv6",
     "alpine.3.14",
-    "alpine.3.13-x64",
+    "alpine.3.13-armv6",
     "alpine.3.13",
-    "alpine.3.12-x64",
+    "alpine.3.12-armv6",
     "alpine.3.12",
-    "alpine.3.11-x64",
+    "alpine.3.11-armv6",
     "alpine.3.11",
-    "alpine.3.10-x64",
+    "alpine.3.10-armv6",
     "alpine.3.10",
-    "alpine.3.9-x64",
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-x64",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-x64",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.17-x86": [
-    "alpine.3.17-x86",
+  "alpine.3.17-ppc64le": [
+    "alpine.3.17-ppc64le",
     "alpine.3.17",
-    "alpine.3.16-x86",
+    "alpine.3.16-ppc64le",
     "alpine.3.16",
-    "alpine.3.15-x86",
+    "alpine.3.15-ppc64le",
     "alpine.3.15",
-    "alpine.3.14-x86",
+    "alpine.3.14-ppc64le",
     "alpine.3.14",
-    "alpine.3.13-x86",
+    "alpine.3.13-ppc64le",
     "alpine.3.13",
-    "alpine.3.12-x86",
+    "alpine.3.12-ppc64le",
     "alpine.3.12",
-    "alpine.3.11-x86",
+    "alpine.3.11-ppc64le",
     "alpine.3.11",
-    "alpine.3.10-x86",
+    "alpine.3.10-ppc64le",
     "alpine.3.10",
-    "alpine.3.9-x86",
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-x86",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-x86",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -1792,57 +1756,93 @@
     "alpine.3.11",
     "alpine.3.10-s390x",
     "alpine.3.10",
-    "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.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-s390x",
+    "alpine.3.8-x64",
     "alpine.3.8",
-    "alpine.3.7-s390x",
+    "alpine.3.7-x64",
     "alpine.3.7",
-    "alpine.3.6-s390x",
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-s390x",
+    "alpine-x64",
     "alpine",
-    "linux-musl-s390x",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-s390x",
+    "linux-x64",
     "linux",
-    "unix-s390x",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.17-ppc64le": [
-    "alpine.3.17-ppc64le",
+  "alpine.3.17-x86": [
+    "alpine.3.17-x86",
     "alpine.3.17",
-    "alpine.3.16-ppc64le",
+    "alpine.3.16-x86",
     "alpine.3.16",
-    "alpine.3.15-ppc64le",
+    "alpine.3.15-x86",
     "alpine.3.15",
-    "alpine.3.14-ppc64le",
+    "alpine.3.14-x86",
     "alpine.3.14",
-    "alpine.3.13-ppc64le",
+    "alpine.3.13-x86",
     "alpine.3.13",
-    "alpine.3.12-ppc64le",
+    "alpine.3.12-x86",
     "alpine.3.12",
-    "alpine.3.11-ppc64le",
+    "alpine.3.11-x86",
     "alpine.3.11",
-    "alpine.3.10-ppc64le",
+    "alpine.3.10-x86",
     "alpine.3.10",
-    "alpine.3.9-ppc64le",
+    "alpine.3.9-x86",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-x86",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-x86",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x86",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x86",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x86",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x86",
     "linux",
-    "unix-ppc64le",
+    "unix-x86",
     "unix",
     "any",
     "base"
@@ -1870,20 +1870,6 @@
     "any",
     "base"
   ],
-  "alpine.3.6-armv6": [
-    "alpine.3.6-armv6",
-    "alpine.3.6",
-    "alpine-armv6",
-    "alpine",
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.6-arm64": [
     "alpine.3.6-arm64",
     "alpine.3.6",
@@ -1898,30 +1884,30 @@
     "any",
     "base"
   ],
-  "alpine.3.6-x64": [
-    "alpine.3.6-x64",
+  "alpine.3.6-armv6": [
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.6-x86": [
-    "alpine.3.6-x86",
+  "alpine.3.6-ppc64le": [
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -1940,58 +1926,56 @@
     "any",
     "base"
   ],
-  "alpine.3.6-ppc64le": [
-    "alpine.3.6-ppc64le",
+  "alpine.3.6-x64": [
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.7": [
-    "alpine.3.7",
+  "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.7-arm": [
-    "alpine.3.7-arm",
+  "alpine.3.7": [
     "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.7-armv6": [
-    "alpine.3.7-armv6",
+  "alpine.3.7-arm": [
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-arm",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-armv6",
+    "linux-arm",
     "linux",
-    "unix-armv6",
+    "unix-arm",
     "unix",
     "any",
     "base"
@@ -2012,34 +1996,34 @@
     "any",
     "base"
   ],
-  "alpine.3.7-x64": [
-    "alpine.3.7-x64",
+  "alpine.3.7-armv6": [
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.7-x86": [
-    "alpine.3.7-x86",
+  "alpine.3.7-ppc64le": [
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -2060,65 +2044,63 @@
     "any",
     "base"
   ],
-  "alpine.3.7-ppc64le": [
-    "alpine.3.7-ppc64le",
+  "alpine.3.7-x64": [
+    "alpine.3.7-x64",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.8": [
-    "alpine.3.8",
+  "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.8-arm": [
-    "alpine.3.8-arm",
+  "alpine.3.8": [
     "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.8-armv6": [
-    "alpine.3.8-armv6",
+  "alpine.3.8-arm": [
+    "alpine.3.8-arm",
     "alpine.3.8",
-    "alpine.3.7-armv6",
+    "alpine.3.7-arm",
     "alpine.3.7",
-    "alpine.3.6-armv6",
+    "alpine.3.6-arm",
     "alpine.3.6",
-    "alpine-armv6",
+    "alpine-arm",
     "alpine",
-    "linux-musl-armv6",
+    "linux-musl-arm",
     "linux-musl",
-    "linux-armv6",
+    "linux-arm",
     "linux",
-    "unix-armv6",
+    "unix-arm",
     "unix",
     "any",
     "base"
@@ -2141,38 +2123,38 @@
     "any",
     "base"
   ],
-  "alpine.3.8-x64": [
-    "alpine.3.8-x64",
+  "alpine.3.8-armv6": [
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-x64",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.8-x86": [
-    "alpine.3.8-x86",
+  "alpine.3.8-ppc64le": [
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-x86",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -2182,33 +2164,51 @@
     "alpine.3.8",
     "alpine.3.7-s390x",
     "alpine.3.7",
-    "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.8-x64": [
+    "alpine.3.8-x64",
+    "alpine.3.8",
+    "alpine.3.7-x64",
+    "alpine.3.7",
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-s390x",
+    "alpine-x64",
     "alpine",
-    "linux-musl-s390x",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-s390x",
+    "linux-x64",
     "linux",
-    "unix-s390x",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.8-ppc64le": [
-    "alpine.3.8-ppc64le",
+  "alpine.3.8-x86": [
+    "alpine.3.8-x86",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-x86",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x86",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x86",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x86",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x86",
     "linux",
-    "unix-ppc64le",
+    "unix-x86",
     "unix",
     "any",
     "base"
@@ -2245,26 +2245,6 @@
     "any",
     "base"
   ],
-  "alpine.3.9-armv6": [
-    "alpine.3.9-armv6",
-    "alpine.3.9",
-    "alpine.3.8-armv6",
-    "alpine.3.8",
-    "alpine.3.7-armv6",
-    "alpine.3.7",
-    "alpine.3.6-armv6",
-    "alpine.3.6",
-    "alpine-armv6",
-    "alpine",
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "alpine.3.9-arm64": [
     "alpine.3.9-arm64",
     "alpine.3.9",
@@ -2285,42 +2265,42 @@
     "any",
     "base"
   ],
-  "alpine.3.9-x64": [
-    "alpine.3.9-x64",
+  "alpine.3.9-armv6": [
+    "alpine.3.9-armv6",
     "alpine.3.9",
-    "alpine.3.8-x64",
+    "alpine.3.8-armv6",
     "alpine.3.8",
-    "alpine.3.7-x64",
+    "alpine.3.7-armv6",
     "alpine.3.7",
-    "alpine.3.6-x64",
+    "alpine.3.6-armv6",
     "alpine.3.6",
-    "alpine-x64",
+    "alpine-armv6",
     "alpine",
-    "linux-musl-x64",
+    "linux-musl-armv6",
     "linux-musl",
-    "linux-x64",
+    "linux-armv6",
     "linux",
-    "unix-x64",
+    "unix-armv6",
     "unix",
     "any",
     "base"
   ],
-  "alpine.3.9-x86": [
-    "alpine.3.9-x86",
+  "alpine.3.9-ppc64le": [
+    "alpine.3.9-ppc64le",
     "alpine.3.9",
-    "alpine.3.8-x86",
+    "alpine.3.8-ppc64le",
     "alpine.3.8",
-    "alpine.3.7-x86",
+    "alpine.3.7-ppc64le",
     "alpine.3.7",
-    "alpine.3.6-x86",
+    "alpine.3.6-ppc64le",
     "alpine.3.6",
-    "alpine-x86",
+    "alpine-ppc64le",
     "alpine",
-    "linux-musl-x86",
+    "linux-musl-ppc64le",
     "linux-musl",
-    "linux-x86",
+    "linux-ppc64le",
     "linux",
-    "unix-x86",
+    "unix-ppc64le",
     "unix",
     "any",
     "base"
@@ -2345,22 +2325,42 @@
     "any",
     "base"
   ],
-  "alpine.3.9-ppc64le": [
-    "alpine.3.9-ppc64le",
+  "alpine.3.9-x64": [
+    "alpine.3.9-x64",
     "alpine.3.9",
-    "alpine.3.8-ppc64le",
+    "alpine.3.8-x64",
     "alpine.3.8",
-    "alpine.3.7-ppc64le",
+    "alpine.3.7-x64",
     "alpine.3.7",
-    "alpine.3.6-ppc64le",
+    "alpine.3.6-x64",
     "alpine.3.6",
-    "alpine-ppc64le",
+    "alpine-x64",
     "alpine",
-    "linux-musl-ppc64le",
+    "linux-musl-x64",
     "linux-musl",
-    "linux-ppc64le",
+    "linux-x64",
     "linux",
-    "unix-ppc64le",
+    "unix-x64",
+    "unix",
+    "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"
@@ -3835,17 +3835,6 @@
     "any",
     "base"
   ],
-  "wasi": [
-    "wasi",
-    "any",
-    "base"
-  ],
-  "wasi-wasm": [
-    "wasi-wasm",
-    "wasi",
-    "any",
-    "base"
-  ],
   "centos": [
     "centos",
     "rhel",
@@ -4879,14 +4868,6 @@
     "any",
     "base"
   ],
-  "freebsd-x64": [
-    "freebsd-x64",
-    "freebsd",
-    "unix-x64",
-    "unix",
-    "any",
-    "base"
-  ],
   "freebsd-arm64": [
     "freebsd-arm64",
     "freebsd",
@@ -4895,19 +4876,17 @@
     "any",
     "base"
   ],
-  "freebsd.12": [
-    "freebsd.12",
+  "freebsd-x64": [
+    "freebsd-x64",
     "freebsd",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "freebsd.12-x64": [
-    "freebsd.12-x64",
+  "freebsd.12": [
     "freebsd.12",
-    "freebsd-x64",
     "freebsd",
-    "unix-x64",
     "unix",
     "any",
     "base"
@@ -4922,22 +4901,20 @@
     "any",
     "base"
   ],
-  "freebsd.13": [
-    "freebsd.13",
+  "freebsd.12-x64": [
+    "freebsd.12-x64",
     "freebsd.12",
+    "freebsd-x64",
     "freebsd",
+    "unix-x64",
     "unix",
     "any",
     "base"
   ],
-  "freebsd.13-x64": [
-    "freebsd.13-x64",
+  "freebsd.13": [
     "freebsd.13",
-    "freebsd.12-x64",
     "freebsd.12",
-    "freebsd-x64",
     "freebsd",
-    "unix-x64",
     "unix",
     "any",
     "base"
@@ -4954,6 +4931,18 @@
     "any",
     "base"
   ],
+  "freebsd.13-x64": [
+    "freebsd.13-x64",
+    "freebsd.13",
+    "freebsd.12-x64",
+    "freebsd.12",
+    "freebsd-x64",
+    "freebsd",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "gentoo": [
     "gentoo",
     "linux",
@@ -5714,16 +5703,6 @@
     "any",
     "base"
   ],
-  "linux-musl-armv6": [
-    "linux-musl-armv6",
-    "linux-musl",
-    "linux-armv6",
-    "linux",
-    "unix-armv6",
-    "unix",
-    "any",
-    "base"
-  ],
   "linux-musl-arm64": [
     "linux-musl-arm64",
     "linux-musl",
@@ -5744,6 +5723,16 @@
     "any",
     "base"
   ],
+  "linux-musl-armv6": [
+    "linux-musl-armv6",
+    "linux-musl",
+    "linux-armv6",
+    "linux",
+    "unix-armv6",
+    "unix",
+    "any",
+    "base"
+  ],
   "linux-musl-ppc64le": [
     "linux-musl-ppc64le",
     "linux-musl",
@@ -10464,6 +10453,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",
@@ -10529,6 +10583,17 @@
     "any",
     "base"
   ],
+  "wasi": [
+    "wasi",
+    "any",
+    "base"
+  ],
+  "wasi-wasm": [
+    "wasi-wasm",
+    "wasi",
+    "any",
+    "base"
+  ],
   "win": [
     "win",
     "any",
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
index eb865ee6422de..9fc9a05aeccaf 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -11,28 +11,22 @@
         "linux-musl-arm"
       ]
     },
-    "alpine-armv6": {
-      "#import": [
-        "alpine",
-        "linux-musl-armv6"
-      ]
-    },
     "alpine-arm64": {
       "#import": [
         "alpine",
         "linux-musl-arm64"
       ]
     },
-    "alpine-x64": {
+    "alpine-armv6": {
       "#import": [
         "alpine",
-        "linux-musl-x64"
+        "linux-musl-armv6"
       ]
     },
-    "alpine-x86": {
+    "alpine-ppc64le": {
       "#import": [
         "alpine",
-        "linux-musl-x86"
+        "linux-musl-ppc64le"
       ]
     },
     "alpine-s390x": {
@@ -41,10 +35,16 @@
         "linux-musl-s390x"
       ]
     },
-    "alpine-ppc64le": {
+    "alpine-x64": {
       "#import": [
         "alpine",
-        "linux-musl-ppc64le"
+        "linux-musl-x64"
+      ]
+    },
+    "alpine-x86": {
+      "#import": [
+        "alpine",
+        "linux-musl-x86"
       ]
     },
     "alpine.3.10": {
@@ -58,28 +58,22 @@
         "alpine.3.9-arm"
       ]
     },
-    "alpine.3.10-armv6": {
-      "#import": [
-        "alpine.3.10",
-        "alpine.3.9-armv6"
-      ]
-    },
     "alpine.3.10-arm64": {
       "#import": [
         "alpine.3.10",
         "alpine.3.9-arm64"
       ]
     },
-    "alpine.3.10-x64": {
+    "alpine.3.10-armv6": {
       "#import": [
         "alpine.3.10",
-        "alpine.3.9-x64"
+        "alpine.3.9-armv6"
       ]
     },
-    "alpine.3.10-x86": {
+    "alpine.3.10-ppc64le": {
       "#import": [
         "alpine.3.10",
-        "alpine.3.9-x86"
+        "alpine.3.9-ppc64le"
       ]
     },
     "alpine.3.10-s390x": {
@@ -88,10 +82,16 @@
         "alpine.3.9-s390x"
       ]
     },
-    "alpine.3.10-ppc64le": {
+    "alpine.3.10-x64": {
       "#import": [
         "alpine.3.10",
-        "alpine.3.9-ppc64le"
+        "alpine.3.9-x64"
+      ]
+    },
+    "alpine.3.10-x86": {
+      "#import": [
+        "alpine.3.10",
+        "alpine.3.9-x86"
       ]
     },
     "alpine.3.11": {
@@ -105,28 +105,22 @@
         "alpine.3.10-arm"
       ]
     },
-    "alpine.3.11-armv6": {
-      "#import": [
-        "alpine.3.11",
-        "alpine.3.10-armv6"
-      ]
-    },
     "alpine.3.11-arm64": {
       "#import": [
         "alpine.3.11",
         "alpine.3.10-arm64"
       ]
     },
-    "alpine.3.11-x64": {
+    "alpine.3.11-armv6": {
       "#import": [
         "alpine.3.11",
-        "alpine.3.10-x64"
+        "alpine.3.10-armv6"
       ]
     },
-    "alpine.3.11-x86": {
+    "alpine.3.11-ppc64le": {
       "#import": [
         "alpine.3.11",
-        "alpine.3.10-x86"
+        "alpine.3.10-ppc64le"
       ]
     },
     "alpine.3.11-s390x": {
@@ -135,10 +129,16 @@
         "alpine.3.10-s390x"
       ]
     },
-    "alpine.3.11-ppc64le": {
+    "alpine.3.11-x64": {
       "#import": [
         "alpine.3.11",
-        "alpine.3.10-ppc64le"
+        "alpine.3.10-x64"
+      ]
+    },
+    "alpine.3.11-x86": {
+      "#import": [
+        "alpine.3.11",
+        "alpine.3.10-x86"
       ]
     },
     "alpine.3.12": {
@@ -152,28 +152,22 @@
         "alpine.3.11-arm"
       ]
     },
-    "alpine.3.12-armv6": {
-      "#import": [
-        "alpine.3.12",
-        "alpine.3.11-armv6"
-      ]
-    },
     "alpine.3.12-arm64": {
       "#import": [
         "alpine.3.12",
         "alpine.3.11-arm64"
       ]
     },
-    "alpine.3.12-x64": {
+    "alpine.3.12-armv6": {
       "#import": [
         "alpine.3.12",
-        "alpine.3.11-x64"
+        "alpine.3.11-armv6"
       ]
     },
-    "alpine.3.12-x86": {
+    "alpine.3.12-ppc64le": {
       "#import": [
         "alpine.3.12",
-        "alpine.3.11-x86"
+        "alpine.3.11-ppc64le"
       ]
     },
     "alpine.3.12-s390x": {
@@ -182,10 +176,16 @@
         "alpine.3.11-s390x"
       ]
     },
-    "alpine.3.12-ppc64le": {
+    "alpine.3.12-x64": {
       "#import": [
         "alpine.3.12",
-        "alpine.3.11-ppc64le"
+        "alpine.3.11-x64"
+      ]
+    },
+    "alpine.3.12-x86": {
+      "#import": [
+        "alpine.3.12",
+        "alpine.3.11-x86"
       ]
     },
     "alpine.3.13": {
@@ -199,28 +199,22 @@
         "alpine.3.12-arm"
       ]
     },
-    "alpine.3.13-armv6": {
-      "#import": [
-        "alpine.3.13",
-        "alpine.3.12-armv6"
-      ]
-    },
     "alpine.3.13-arm64": {
       "#import": [
         "alpine.3.13",
         "alpine.3.12-arm64"
       ]
     },
-    "alpine.3.13-x64": {
+    "alpine.3.13-armv6": {
       "#import": [
         "alpine.3.13",
-        "alpine.3.12-x64"
+        "alpine.3.12-armv6"
       ]
     },
-    "alpine.3.13-x86": {
+    "alpine.3.13-ppc64le": {
       "#import": [
         "alpine.3.13",
-        "alpine.3.12-x86"
+        "alpine.3.12-ppc64le"
       ]
     },
     "alpine.3.13-s390x": {
@@ -229,10 +223,16 @@
         "alpine.3.12-s390x"
       ]
     },
-    "alpine.3.13-ppc64le": {
+    "alpine.3.13-x64": {
       "#import": [
         "alpine.3.13",
-        "alpine.3.12-ppc64le"
+        "alpine.3.12-x64"
+      ]
+    },
+    "alpine.3.13-x86": {
+      "#import": [
+        "alpine.3.13",
+        "alpine.3.12-x86"
       ]
     },
     "alpine.3.14": {
@@ -246,28 +246,22 @@
         "alpine.3.13-arm"
       ]
     },
-    "alpine.3.14-armv6": {
-      "#import": [
-        "alpine.3.14",
-        "alpine.3.13-armv6"
-      ]
-	},
     "alpine.3.14-arm64": {
       "#import": [
         "alpine.3.14",
         "alpine.3.13-arm64"
       ]
     },
-    "alpine.3.14-x64": {
+    "alpine.3.14-armv6": {
       "#import": [
         "alpine.3.14",
-        "alpine.3.13-x64"
+        "alpine.3.13-armv6"
       ]
     },
-    "alpine.3.14-x86": {
+    "alpine.3.14-ppc64le": {
       "#import": [
         "alpine.3.14",
-        "alpine.3.13-x86"
+        "alpine.3.13-ppc64le"
       ]
     },
     "alpine.3.14-s390x": {
@@ -276,10 +270,16 @@
         "alpine.3.13-s390x"
       ]
     },
-    "alpine.3.14-ppc64le": {
+    "alpine.3.14-x64": {
       "#import": [
         "alpine.3.14",
-        "alpine.3.13-ppc64le"
+        "alpine.3.13-x64"
+      ]
+    },
+    "alpine.3.14-x86": {
+      "#import": [
+        "alpine.3.14",
+        "alpine.3.13-x86"
       ]
     },
     "alpine.3.15": {
@@ -293,28 +293,22 @@
         "alpine.3.14-arm"
       ]
     },
-    "alpine.3.15-armv6": {
-      "#import": [
-        "alpine.3.15",
-        "alpine.3.14-armv6"
-      ]
-	},
     "alpine.3.15-arm64": {
       "#import": [
         "alpine.3.15",
         "alpine.3.14-arm64"
       ]
     },
-    "alpine.3.15-x64": {
+    "alpine.3.15-armv6": {
       "#import": [
         "alpine.3.15",
-        "alpine.3.14-x64"
+        "alpine.3.14-armv6"
       ]
     },
-    "alpine.3.15-x86": {
+    "alpine.3.15-ppc64le": {
       "#import": [
         "alpine.3.15",
-        "alpine.3.14-x86"
+        "alpine.3.14-ppc64le"
       ]
     },
     "alpine.3.15-s390x": {
@@ -323,10 +317,16 @@
         "alpine.3.14-s390x"
       ]
     },
-    "alpine.3.15-ppc64le": {
+    "alpine.3.15-x64": {
       "#import": [
         "alpine.3.15",
-        "alpine.3.14-ppc64le"
+        "alpine.3.14-x64"
+      ]
+    },
+    "alpine.3.15-x86": {
+      "#import": [
+        "alpine.3.15",
+        "alpine.3.14-x86"
       ]
     },
     "alpine.3.16": {
@@ -340,28 +340,22 @@
         "alpine.3.15-arm"
       ]
     },
-    "alpine.3.16-armv6": {
-      "#import": [
-        "alpine.3.16",
-        "alpine.3.15-armv6"
-      ]
-	},
     "alpine.3.16-arm64": {
       "#import": [
         "alpine.3.16",
         "alpine.3.15-arm64"
       ]
     },
-    "alpine.3.16-x64": {
+    "alpine.3.16-armv6": {
       "#import": [
         "alpine.3.16",
-        "alpine.3.15-x64"
+        "alpine.3.15-armv6"
       ]
     },
-    "alpine.3.16-x86": {
+    "alpine.3.16-ppc64le": {
       "#import": [
         "alpine.3.16",
-        "alpine.3.15-x86"
+        "alpine.3.15-ppc64le"
       ]
     },
     "alpine.3.16-s390x": {
@@ -370,10 +364,16 @@
         "alpine.3.15-s390x"
       ]
     },
-    "alpine.3.16-ppc64le": {
+    "alpine.3.16-x64": {
       "#import": [
         "alpine.3.16",
-        "alpine.3.15-ppc64le"
+        "alpine.3.15-x64"
+      ]
+    },
+    "alpine.3.16-x86": {
+      "#import": [
+        "alpine.3.16",
+        "alpine.3.15-x86"
       ]
     },
     "alpine.3.17": {
@@ -387,28 +387,22 @@
         "alpine.3.16-arm"
       ]
     },
-    "alpine.3.17-armv6": {
-      "#import": [
-        "alpine.3.17",
-        "alpine.3.16-armv6"
-      ]
-    },
     "alpine.3.17-arm64": {
       "#import": [
         "alpine.3.17",
         "alpine.3.16-arm64"
       ]
     },
-    "alpine.3.17-x64": {
+    "alpine.3.17-armv6": {
       "#import": [
         "alpine.3.17",
-        "alpine.3.16-x64"
+        "alpine.3.16-armv6"
       ]
     },
-    "alpine.3.17-x86": {
+    "alpine.3.17-ppc64le": {
       "#import": [
         "alpine.3.17",
-        "alpine.3.16-x86"
+        "alpine.3.16-ppc64le"
       ]
     },
     "alpine.3.17-s390x": {
@@ -417,10 +411,16 @@
         "alpine.3.16-s390x"
       ]
     },
-    "alpine.3.17-ppc64le": {
+    "alpine.3.17-x64": {
       "#import": [
         "alpine.3.17",
-        "alpine.3.16-ppc64le"
+        "alpine.3.16-x64"
+      ]
+    },
+    "alpine.3.17-x86": {
+      "#import": [
+        "alpine.3.17",
+        "alpine.3.16-x86"
       ]
     },
     "alpine.3.6": {
@@ -434,28 +434,22 @@
         "alpine-arm"
       ]
     },
-    "alpine.3.6-armv6": {
-      "#import": [
-        "alpine.3.6",
-        "alpine-armv6"
-      ]
-    },
     "alpine.3.6-arm64": {
       "#import": [
         "alpine.3.6",
         "alpine-arm64"
       ]
     },
-    "alpine.3.6-x64": {
+    "alpine.3.6-armv6": {
       "#import": [
         "alpine.3.6",
-        "alpine-x64"
+        "alpine-armv6"
       ]
     },
-    "alpine.3.6-x86": {
+    "alpine.3.6-ppc64le": {
       "#import": [
         "alpine.3.6",
-        "alpine-x86"
+        "alpine-ppc64le"
       ]
     },
     "alpine.3.6-s390x": {
@@ -464,10 +458,16 @@
         "alpine-s390x"
       ]
     },
-    "alpine.3.6-ppc64le": {
+    "alpine.3.6-x64": {
       "#import": [
         "alpine.3.6",
-        "alpine-ppc64le"
+        "alpine-x64"
+      ]
+    },
+    "alpine.3.6-x86": {
+      "#import": [
+        "alpine.3.6",
+        "alpine-x86"
       ]
     },
     "alpine.3.7": {
@@ -481,28 +481,22 @@
         "alpine.3.6-arm"
       ]
     },
-    "alpine.3.7-armv6": {
-      "#import": [
-        "alpine.3.7",
-        "alpine.3.6-armv6"
-      ]
-    },
     "alpine.3.7-arm64": {
       "#import": [
         "alpine.3.7",
         "alpine.3.6-arm64"
       ]
     },
-    "alpine.3.7-x64": {
+    "alpine.3.7-armv6": {
       "#import": [
         "alpine.3.7",
-        "alpine.3.6-x64"
+        "alpine.3.6-armv6"
       ]
     },
-    "alpine.3.7-x86": {
+    "alpine.3.7-ppc64le": {
       "#import": [
         "alpine.3.7",
-        "alpine.3.6-x86"
+        "alpine.3.6-ppc64le"
       ]
     },
     "alpine.3.7-s390x": {
@@ -511,10 +505,16 @@
         "alpine.3.6-s390x"
       ]
     },
-    "alpine.3.7-ppc64le": {
+    "alpine.3.7-x64": {
       "#import": [
         "alpine.3.7",
-        "alpine.3.6-ppc64le"
+        "alpine.3.6-x64"
+      ]
+    },
+    "alpine.3.7-x86": {
+      "#import": [
+        "alpine.3.7",
+        "alpine.3.6-x86"
       ]
     },
     "alpine.3.8": {
@@ -528,28 +528,22 @@
         "alpine.3.7-arm"
       ]
     },
-    "alpine.3.8-armv6": {
-      "#import": [
-        "alpine.3.8",
-        "alpine.3.7-armv6"
-      ]
-    },
     "alpine.3.8-arm64": {
       "#import": [
         "alpine.3.8",
         "alpine.3.7-arm64"
       ]
     },
-    "alpine.3.8-x64": {
+    "alpine.3.8-armv6": {
       "#import": [
         "alpine.3.8",
-        "alpine.3.7-x64"
+        "alpine.3.7-armv6"
       ]
     },
-    "alpine.3.8-x86": {
+    "alpine.3.8-ppc64le": {
       "#import": [
         "alpine.3.8",
-        "alpine.3.7-x86"
+        "alpine.3.7-ppc64le"
       ]
     },
     "alpine.3.8-s390x": {
@@ -558,10 +552,16 @@
         "alpine.3.7-s390x"
       ]
     },
-    "alpine.3.8-ppc64le": {
+    "alpine.3.8-x64": {
       "#import": [
         "alpine.3.8",
-        "alpine.3.7-ppc64le"
+        "alpine.3.7-x64"
+      ]
+    },
+    "alpine.3.8-x86": {
+      "#import": [
+        "alpine.3.8",
+        "alpine.3.7-x86"
       ]
     },
     "alpine.3.9": {
@@ -575,28 +575,22 @@
         "alpine.3.8-arm"
       ]
     },
-    "alpine.3.9-armv6": {
-      "#import": [
-        "alpine.3.9",
-        "alpine.3.8-armv6"
-      ]
-    },
     "alpine.3.9-arm64": {
       "#import": [
         "alpine.3.9",
         "alpine.3.8-arm64"
       ]
     },
-    "alpine.3.9-x64": {
+    "alpine.3.9-armv6": {
       "#import": [
         "alpine.3.9",
-        "alpine.3.8-x64"
+        "alpine.3.8-armv6"
       ]
     },
-    "alpine.3.9-x86": {
+    "alpine.3.9-ppc64le": {
       "#import": [
         "alpine.3.9",
-        "alpine.3.8-x86"
+        "alpine.3.8-ppc64le"
       ]
     },
     "alpine.3.9-s390x": {
@@ -605,10 +599,16 @@
         "alpine.3.8-s390x"
       ]
     },
-    "alpine.3.9-ppc64le": {
+    "alpine.3.9-x64": {
       "#import": [
         "alpine.3.9",
-        "alpine.3.8-ppc64le"
+        "alpine.3.8-x64"
+      ]
+    },
+    "alpine.3.9-x86": {
+      "#import": [
+        "alpine.3.9",
+        "alpine.3.8-x86"
       ]
     },
     "android": {
@@ -1022,16 +1022,6 @@
         "browser"
       ]
     },
-    "wasi": {
-      "#import": [
-        "any"
-      ]
-    },
-    "wasi-wasm": {
-      "#import": [
-        "wasi"
-      ]
-    },
     "centos": {
       "#import": [
         "rhel"
@@ -1582,16 +1572,16 @@
         "unix"
       ]
     },
-    "freebsd-x64": {
+    "freebsd-arm64": {
       "#import": [
         "freebsd",
-        "unix-x64"
+        "unix-arm64"
       ]
     },
-    "freebsd-arm64": {
+    "freebsd-x64": {
       "#import": [
         "freebsd",
-        "unix-arm64"
+        "unix-x64"
       ]
     },
     "freebsd.12": {
@@ -1599,16 +1589,16 @@
         "freebsd"
       ]
     },
-    "freebsd.12-x64": {
+    "freebsd.12-arm64": {
       "#import": [
         "freebsd.12",
-        "freebsd-x64"
+        "freebsd-arm64"
       ]
     },
-    "freebsd.12-arm64": {
+    "freebsd.12-x64": {
       "#import": [
         "freebsd.12",
-        "freebsd-arm64"
+        "freebsd-x64"
       ]
     },
     "freebsd.13": {
@@ -1616,16 +1606,16 @@
         "freebsd.12"
       ]
     },
-    "freebsd.13-x64": {
+    "freebsd.13-arm64": {
       "#import": [
         "freebsd.13",
-        "freebsd.12-x64"
+        "freebsd.12-arm64"
       ]
     },
-    "freebsd.13-arm64": {
+    "freebsd.13-x64": {
       "#import": [
         "freebsd.13",
-        "freebsd.12-arm64"
+        "freebsd.12-x64"
       ]
     },
     "gentoo": {
@@ -2005,12 +1995,6 @@
         "linux-arm"
       ]
     },
-    "linux-musl-armv6": {
-      "#import": [
-        "linux-musl",
-        "linux-armv6"
-      ]
-    },
     "linux-musl-arm64": {
       "#import": [
         "linux-musl",
@@ -2023,6 +2007,12 @@
         "linux-armel"
       ]
     },
+    "linux-musl-armv6": {
+      "#import": [
+        "linux-musl",
+        "linux-armv6"
+      ]
+    },
     "linux-musl-ppc64le": {
       "#import": [
         "linux-musl",
@@ -4027,6 +4017,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"
@@ -4082,6 +4101,16 @@
         "unix"
       ]
     },
+    "wasi": {
+      "#import": [
+        "any"
+      ]
+    },
+    "wasi-wasm": {
+      "#import": [
+        "wasi"
+      ]
+    },
     "win": {
       "#import": [
         "any"
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
index 08327c9c112c8..9aae135846bd0 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -267,7 +267,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>
 

From 46fd9f4c6bb9b60f925b2ee52b194100d54dde35 Mon Sep 17 00:00:00 2001
From: wfurt <tweinfurt@yahoo.com>
Date: Tue, 21 Feb 2023 18:50:32 -0800
Subject: [PATCH 2/2] fix resolve

---
 .../src/runtime.compatibility.json            | 27 ++++++++++---------
 .../src/runtime.json                          | 22 ++++++++-------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index fdcc30ba941a4..28020662a8fc2 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -5686,14 +5686,6 @@
     "any",
     "base"
   ],
-  "linux-riscv64": [
-    "linux-riscv64",
-    "linux",
-    "unix-riscv64",
-    "unix",
-    "any",
-    "base"
-  ],
   "linux-musl": [
     "linux-musl",
     "linux",
@@ -5789,6 +5781,14 @@
     "any",
     "base"
   ],
+  "linux-riscv64": [
+    "linux-riscv64",
+    "linux",
+    "unix-riscv64",
+    "unix",
+    "any",
+    "base"
+  ],
   "linux-s390x": [
     "linux-s390x",
     "linux",
@@ -10573,6 +10573,12 @@
     "any",
     "base"
   ],
+  "unix-riscv64": [
+    "unix-riscv64",
+    "unix",
+    "any",
+    "base"
+  ],
   "unix-s390x": [
     "unix-s390x",
     "unix",
@@ -10599,9 +10605,6 @@
   "wasi-wasm": [
     "wasi-wasm",
     "wasi",
-  "unix-riscv64": [
-    "unix-riscv64",
-    "unix",
     "any",
     "base"
   ],
@@ -11235,4 +11238,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 fd4e66aa43a5f..36d85d72470ae 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -1984,12 +1984,6 @@
         "unix-mips64"
       ]
     },
-    "linux-riscv64": {
-      "#import": [
-        "linux",
-        "unix-riscv64"
-      ]
-    },
     "linux-musl": {
       "#import": [
         "linux"
@@ -2049,6 +2043,12 @@
         "unix-ppc64le"
       ]
     },
+    "linux-riscv64": {
+      "#import": [
+        "linux",
+        "unix-riscv64"
+      ]
+    },
     "linux-s390x": {
       "#import": [
         "linux",
@@ -4092,6 +4092,11 @@
         "unix"
       ]
     },
+    "unix-riscv64": {
+      "#import": [
+        "unix"
+      ]
+    },
     "unix-s390x": {
       "#import": [
         "unix"
@@ -4115,9 +4120,6 @@
     "wasi-wasm": {
       "#import": [
         "wasi"
-    "unix-riscv64": {
-      "#import": [
-        "unix"
       ]
     },
     "win": {
@@ -4444,4 +4446,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file