From 7080a82f44a7df15409e24fb8c139f3636af38ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lipinsk=C3=BD?=
 <lukas.lipinsky@oracle.com>
Date: Thu, 6 Oct 2022 08:11:18 +0000
Subject: [PATCH] Add missing OL Runtime IDs

Date: May 12, 2023
Updated for OL9U2
Signed-off by: John McWalters <john.mcwalters@oracle.com>

---
 .../src/runtime.compatibility.json            | 2041 +++++++++++++++--
 .../src/runtime.json                          |  428 ++++
 .../src/runtimeGroups.props                   |   18 +-
 3 files changed, 2293 insertions(+), 194 deletions(-)

diff -Nur a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
--- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json	2023-05-12 11:50:16.390500783 -0700
+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json	2023-05-12 13:59:46.470272232 -0700
@@ -5475,6 +5475,18 @@
     "any",
     "base"
   ],
+  "ol-arm64": [
+    "ol-arm64",
+    "ol",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "ol-x64": [
     "ol-x64",
     "ol",
@@ -5863,6 +5875,246 @@
     "any",
     "base"
   ],
+  "ol.7.7": [
+    "ol.7.7",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7",
+    "rhel.7.0",
+    "ol",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.7.7-x64": [
+    "ol.7.7-x64",
+    "ol.7.7",
+    "ol.7.6-x64",
+    "rhel.7.7-x64",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5-x64",
+    "rhel.7.6-x64",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
+    "ol-x64",
+    "rhel.7-x64",
+    "ol",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.7.8": [
+    "ol.7.8",
+    "ol.7.7",
+    "rhel.7.8",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7",
+    "rhel.7.0",
+    "ol",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.7.8-x64": [
+    "ol.7.8-x64",
+    "ol.7.8",
+    "ol.7.7-x64",
+    "rhel.7.8-x64",
+    "ol.7.7",
+    "rhel.7.8",
+    "ol.7.6-x64",
+    "rhel.7.7-x64",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5-x64",
+    "rhel.7.6-x64",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
+    "ol-x64",
+    "rhel.7-x64",
+    "ol",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.7.9": [
+    "ol.7.9",
+    "ol.7.8",
+    "rhel.7.9",
+    "ol.7.7",
+    "rhel.7.8",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7",
+    "rhel.7.0",
+    "ol",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.7.9-x64": [
+    "ol.7.9-x64",
+    "ol.7.9",
+    "ol.7.8-x64",
+    "rhel.7.9-x64",
+    "ol.7.8",
+    "rhel.7.9",
+    "ol.7.7-x64",
+    "rhel.7.8-x64",
+    "ol.7.7",
+    "rhel.7.8",
+    "ol.7.6-x64",
+    "rhel.7.7-x64",
+    "ol.7.6",
+    "rhel.7.7",
+    "ol.7.5-x64",
+    "rhel.7.6-x64",
+    "ol.7.5",
+    "rhel.7.6",
+    "ol.7.4-x64",
+    "rhel.7.5-x64",
+    "ol.7.4",
+    "rhel.7.5",
+    "ol.7.3-x64",
+    "rhel.7.4-x64",
+    "ol.7.3",
+    "rhel.7.4",
+    "ol.7.2-x64",
+    "rhel.7.3-x64",
+    "ol.7.2",
+    "rhel.7.3",
+    "ol.7.1-x64",
+    "rhel.7.2-x64",
+    "ol.7.1",
+    "rhel.7.2",
+    "ol.7.0-x64",
+    "rhel.7.1-x64",
+    "ol.7.0",
+    "rhel.7.1",
+    "ol.7-x64",
+    "rhel.7.0-x64",
+    "ol.7",
+    "rhel.7.0",
+    "ol-x64",
+    "rhel.7-x64",
+    "ol",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "ol.8": [
     "ol.8",
     "ol",
@@ -5873,6 +6125,22 @@
     "any",
     "base"
   ],
+  "ol.8-arm64": [
+    "ol.8-arm64",
+    "ol.8",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "ol.8-x64": [
     "ol.8-x64",
     "ol.8",
@@ -5901,6 +6169,26 @@
     "any",
     "base"
   ],
+  "ol.8.0-arm64": [
+    "ol.8.0-arm64",
+    "ol.8.0",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
   "ol.8.0-x64": [
     "ol.8.0-x64",
     "ol.8.0",
@@ -5921,6 +6209,1010 @@
     "any",
     "base"
   ],
+  "ol.8.1": [
+    "ol.8.1",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.1-arm64": [
+    "ol.8.1-arm64",
+    "ol.8.1",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.1-x64": [
+    "ol.8.1-x64",
+    "ol.8.1",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.2": [
+    "ol.8.2",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.2-arm64": [
+    "ol.8.2-arm64",
+    "ol.8.2",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.2-x64": [
+    "ol.8.2-x64",
+    "ol.8.2",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.3": [
+    "ol.8.3",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.3-arm64": [
+    "ol.8.3-arm64",
+    "ol.8.3",
+    "ol.8.2-arm64",
+    "rhel.8.3-arm64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.3-x64": [
+    "ol.8.3-x64",
+    "ol.8.3",
+    "ol.8.2-x64",
+    "rhel.8.3-x64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.4": [
+    "ol.8.4",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.4-arm64": [
+    "ol.8.4-arm64",
+    "ol.8.4",
+    "ol.8.3-arm64",
+    "rhel.8.4-arm64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-arm64",
+    "rhel.8.3-arm64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.4-x64": [
+    "ol.8.4-x64",
+    "ol.8.4",
+    "ol.8.3-x64",
+    "rhel.8.4-x64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-x64",
+    "rhel.8.3-x64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.5": [
+    "ol.8.5",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.5-arm64": [
+    "ol.8.5-arm64",
+    "ol.8.5",
+    "ol.8.4-arm64",
+    "rhel.8.5-arm64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-arm64",
+    "rhel.8.4-arm64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-arm64",
+    "rhel.8.3-arm64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.5-x64": [
+    "ol.8.5-x64",
+    "ol.8.5",
+    "ol.8.4-x64",
+    "rhel.8.5-x64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-x64",
+    "rhel.8.4-x64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-x64",
+    "rhel.8.3-x64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.6": [
+    "ol.8.6",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.6-arm64": [
+    "ol.8.6-arm64",
+    "ol.8.6",
+    "ol.8.5-arm64",
+    "rhel.8.6-arm64",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4-arm64",
+    "rhel.8.5-arm64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-arm64",
+    "rhel.8.4-arm64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-arm64",
+    "rhel.8.3-arm64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.6-x64": [
+    "ol.8.6-x64",
+    "ol.8.6",
+    "ol.8.5-x64",
+    "rhel.8.6-x64",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4-x64",
+    "rhel.8.5-x64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-x64",
+    "rhel.8.4-x64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-x64",
+    "rhel.8.3-x64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.7": [
+    "ol.8.7",
+    "ol.8.6",
+    "rhel.8.7",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.7-arm64": [
+    "ol.8.7-arm64",
+    "ol.8.7",
+    "ol.8.6-arm64",
+    "rhel.8.7-arm64",
+    "ol.8.6",
+    "rhel.8.7",
+    "ol.8.5-arm64",
+    "rhel.8.6-arm64",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4-arm64",
+    "rhel.8.5-arm64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-arm64",
+    "rhel.8.4-arm64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-arm64",
+    "rhel.8.3-arm64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.7-x64": [
+    "ol.8.7-x64",
+    "ol.8.7",
+    "ol.8.6-x64",
+    "rhel.8.7-x64",
+    "ol.8.6",
+    "rhel.8.7",
+    "ol.8.5-x64",
+    "rhel.8.6-x64",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4-x64",
+    "rhel.8.5-x64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-x64",
+    "rhel.8.4-x64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-x64",
+    "rhel.8.3-x64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.8": [
+    "ol.8.8",
+    "ol.8.7",
+    "rhel.8.8",
+    "ol.8.6",
+    "rhel.8.7",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8",
+    "rhel.8.0",
+    "ol",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.8-arm64": [
+    "ol.8.8-arm64",
+    "ol.8.8",
+    "ol.8.7-arm64",
+    "rhel.8.8-arm64",
+    "ol.8.7",
+    "rhel.8.8",
+    "ol.8.6-arm64",
+    "rhel.8.7-arm64",
+    "ol.8.6",
+    "rhel.8.7",
+    "ol.8.5-arm64",
+    "rhel.8.6-arm64",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4-arm64",
+    "rhel.8.5-arm64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-arm64",
+    "rhel.8.4-arm64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-arm64",
+    "rhel.8.3-arm64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-arm64",
+    "rhel.8.2-arm64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-arm64",
+    "rhel.8.1-arm64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-arm64",
+    "rhel.8.0-arm64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-arm64",
+    "rhel.8-arm64",
+    "ol",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.8.8-x64": [
+    "ol.8.8-x64",
+    "ol.8.8",
+    "ol.8.7-x64",
+    "rhel.8.8-x64",
+    "ol.8.7",
+    "rhel.8.8",
+    "ol.8.6-x64",
+    "rhel.8.7-x64",
+    "ol.8.6",
+    "rhel.8.7",
+    "ol.8.5-x64",
+    "rhel.8.6-x64",
+    "ol.8.5",
+    "rhel.8.6",
+    "ol.8.4-x64",
+    "rhel.8.5-x64",
+    "ol.8.4",
+    "rhel.8.5",
+    "ol.8.3-x64",
+    "rhel.8.4-x64",
+    "ol.8.3",
+    "rhel.8.4",
+    "ol.8.2-x64",
+    "rhel.8.3-x64",
+    "ol.8.2",
+    "rhel.8.3",
+    "ol.8.1-x64",
+    "rhel.8.2-x64",
+    "ol.8.1",
+    "rhel.8.2",
+    "ol.8.0-x64",
+    "rhel.8.1-x64",
+    "ol.8.0",
+    "rhel.8.1",
+    "ol.8-x64",
+    "rhel.8.0-x64",
+    "ol.8",
+    "rhel.8.0",
+    "ol-x64",
+    "rhel.8-x64",
+    "ol",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9": [
+    "ol.9",
+    "ol",
+    "rhel.9",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9-arm64": [
+    "ol.9-arm64",
+    "ol.9",
+    "ol-arm64",
+    "rhel.9-arm64",
+    "ol",
+    "rhel.9",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9-x64": [
+    "ol.9-x64",
+    "ol.9",
+    "ol-x64",
+    "rhel.9-x64",
+    "ol",
+    "rhel.9",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.0": [
+    "ol.9.0",
+    "ol.9",
+    "rhel.9.0",
+    "ol",
+    "rhel.9",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.0-arm64": [
+    "ol.9.0-arm64",
+    "ol.9.0",
+    "ol.9-arm64",
+    "rhel.9.0-arm64",
+    "ol.9",
+    "rhel.9.0",
+    "ol-arm64",
+    "rhel.9-arm64",
+    "ol",
+    "rhel.9",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.0-x64": [
+    "ol.9.0-x64",
+    "ol.9.0",
+    "ol.9-x64",
+    "rhel.9.0-x64",
+    "ol.9",
+    "rhel.9.0",
+    "ol-x64",
+    "rhel.9-x64",
+    "ol",
+    "rhel.9",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.1": [
+    "ol.9.1",
+    "ol.9.0",
+    "rhel.9.1",
+    "ol.9",
+    "rhel.9.0",
+    "ol",
+    "rhel.9",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.1-arm64": [
+    "ol.9.1-arm64",
+    "ol.9.1",
+    "ol.9.0-arm64",
+    "rhel.9.1-arm64",
+    "ol.9.0",
+    "rhel.9.1",
+    "ol.9-arm64",
+    "rhel.9.0-arm64",
+    "ol.9",
+    "rhel.9.0",
+    "ol-arm64",
+    "rhel.9-arm64",
+    "ol",
+    "rhel.9",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.1-x64": [
+    "ol.9.1-x64",
+    "ol.9.1",
+    "ol.9.0-x64",
+    "rhel.9.1-x64",
+    "ol.9.0",
+    "rhel.9.1",
+    "ol.9-x64",
+    "rhel.9.0-x64",
+    "ol.9",
+    "rhel.9.0",
+    "ol-x64",
+    "rhel.9-x64",
+    "ol",
+    "rhel.9",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.2": [
+    "ol.9.2",
+    "ol.9.1",
+    "rhel.9.2",
+    "ol.9.0",
+    "rhel.9.1",
+    "ol.9",
+    "rhel.9.0",
+    "ol",
+    "rhel.9",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.2-arm64": [
+    "ol.9.2-arm64",
+    "ol.9.2",
+    "ol.9.1-arm64",
+    "rhel.9.2-arm64",
+    "ol.9.1",
+    "rhel.9.2",
+    "ol.9.0-arm64",
+    "rhel.9.1-arm64",
+    "ol.9.0",
+    "rhel.9.1",
+    "ol.9-arm64",
+    "rhel.9.0-arm64",
+    "ol.9",
+    "rhel.9.0",
+    "ol-arm64",
+    "rhel.9-arm64",
+    "ol",
+    "rhel.9",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ol.9.2-x64": [
+    "ol.9.2-x64",
+    "ol.9.2",
+    "ol.9.1-x64",
+    "rhel.9.2-x64",
+    "ol.9.1",
+    "rhel.9.2",
+    "ol.9.0-x64",
+    "rhel.9.1-x64",
+    "ol.9.0",
+    "rhel.9.1",
+    "ol.9-x64",
+    "rhel.9.0-x64",
+    "ol.9",
+    "rhel.9.0",
+    "ol-x64",
+    "rhel.9-x64",
+    "ol",
+    "rhel.9",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "omnios": [
     "omnios",
     "illumos",
@@ -6920,6 +8212,147 @@
     "any",
     "base"
   ],
+  "rhel.7.7": [
+    "rhel.7.7",
+    "rhel.7.6",
+    "rhel.7.5",
+    "rhel.7.4",
+    "rhel.7.3",
+    "rhel.7.2",
+    "rhel.7.1",
+    "rhel.7.0",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.7-x64": [
+    "rhel.7.7-x64",
+    "rhel.7.7",
+    "rhel.7.6-x64",
+    "rhel.7.6",
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.8": [
+    "rhel.7.8",
+    "rhel.7.7",
+    "rhel.7.6",
+    "rhel.7.5",
+    "rhel.7.4",
+    "rhel.7.3",
+    "rhel.7.2",
+    "rhel.7.1",
+    "rhel.7.0",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.8-x64": [
+    "rhel.7.8-x64",
+    "rhel.7.8",
+    "rhel.7.7-x64",
+    "rhel.7.7",
+    "rhel.7.6-x64",
+    "rhel.7.6",
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.9": [
+    "rhel.7.9",
+    "rhel.7.8",
+    "rhel.7.7",
+    "rhel.7.6",
+    "rhel.7.5",
+    "rhel.7.4",
+    "rhel.7.3",
+    "rhel.7.2",
+    "rhel.7.1",
+    "rhel.7.0",
+    "rhel.7",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.7.9-x64": [
+    "rhel.7.9-x64",
+    "rhel.7.9",
+    "rhel.7.8-x64",
+    "rhel.7.8",
+    "rhel.7.7-x64",
+    "rhel.7.7",
+    "rhel.7.6-x64",
+    "rhel.7.6",
+    "rhel.7.5-x64",
+    "rhel.7.5",
+    "rhel.7.4-x64",
+    "rhel.7.4",
+    "rhel.7.3-x64",
+    "rhel.7.3",
+    "rhel.7.2-x64",
+    "rhel.7.2",
+    "rhel.7.1-x64",
+    "rhel.7.1",
+    "rhel.7.0-x64",
+    "rhel.7.0",
+    "rhel.7-x64",
+    "rhel.7",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel.8": [
     "rhel.8",
     "rhel",
@@ -7031,6 +8464,440 @@
     "any",
     "base"
   ],
+  "rhel.8.2": [
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.2-arm64": [
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.2-x64": [
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.3": [
+    "rhel.8.3",
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.3-arm64": [
+    "rhel.8.3-arm64",
+    "rhel.8.3",
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.3-x64": [
+    "rhel.8.3-x64",
+    "rhel.8.3",
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.4": [
+    "rhel.8.4",
+    "rhel.8.3",
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.4-arm64": [
+    "rhel.8.4-arm64",
+    "rhel.8.4",
+    "rhel.8.3-arm64",
+    "rhel.8.3",
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.4-x64": [
+    "rhel.8.4-x64",
+    "rhel.8.4",
+    "rhel.8.3-x64",
+    "rhel.8.3",
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.5": [
+    "rhel.8.5",
+    "rhel.8.4",
+    "rhel.8.3",
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.5-arm64": [
+    "rhel.8.5-arm64",
+    "rhel.8.5",
+    "rhel.8.4-arm64",
+    "rhel.8.4",
+    "rhel.8.3-arm64",
+    "rhel.8.3",
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.5-x64": [
+    "rhel.8.5-x64",
+    "rhel.8.5",
+    "rhel.8.4-x64",
+    "rhel.8.4",
+    "rhel.8.3-x64",
+    "rhel.8.3",
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.6": [
+    "rhel.8.6",
+    "rhel.8.5",
+    "rhel.8.4",
+    "rhel.8.3",
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.6-arm64": [
+    "rhel.8.6-arm64",
+    "rhel.8.6",
+    "rhel.8.5-arm64",
+    "rhel.8.5",
+    "rhel.8.4-arm64",
+    "rhel.8.4",
+    "rhel.8.3-arm64",
+    "rhel.8.3",
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.6-x64": [
+    "rhel.8.6-x64",
+    "rhel.8.6",
+    "rhel.8.5-x64",
+    "rhel.8.5",
+    "rhel.8.4-x64",
+    "rhel.8.4",
+    "rhel.8.3-x64",
+    "rhel.8.3",
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.7": [
+    "rhel.8.7",
+    "rhel.8.6",
+    "rhel.8.5",
+    "rhel.8.4",
+    "rhel.8.3",
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.7-arm64": [
+    "rhel.8.7-arm64",
+    "rhel.8.7",
+    "rhel.8.6-arm64",
+    "rhel.8.6",
+    "rhel.8.5-arm64",
+    "rhel.8.5",
+    "rhel.8.4-arm64",
+    "rhel.8.4",
+    "rhel.8.3-arm64",
+    "rhel.8.3",
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.7-x64": [
+    "rhel.8.7-x64",
+    "rhel.8.7",
+    "rhel.8.6-x64",
+    "rhel.8.6",
+    "rhel.8.5-x64",
+    "rhel.8.5",
+    "rhel.8.4-x64",
+    "rhel.8.4",
+    "rhel.8.3-x64",
+    "rhel.8.3",
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+    "rhel.8.8": [
+    "rhel.8.8",
+    "rhel.8.7",
+    "rhel.8.6",
+    "rhel.8.5",
+    "rhel.8.4",
+    "rhel.8.3",
+    "rhel.8.2",
+    "rhel.8.1",
+    "rhel.8.0",
+    "rhel.8",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.8-arm64": [
+    "rhel.8.8-arm64",
+    "rhel.8.8",
+    "rhel.8.7-arm64",
+    "rhel.8.7",
+    "rhel.8.6-arm64",
+    "rhel.8.6",
+    "rhel.8.5-arm64",
+    "rhel.8.5",
+    "rhel.8.4-arm64",
+    "rhel.8.4",
+    "rhel.8.3-arm64",
+    "rhel.8.3",
+    "rhel.8.2-arm64",
+    "rhel.8.2",
+    "rhel.8.1-arm64",
+    "rhel.8.1",
+    "rhel.8.0-arm64",
+    "rhel.8.0",
+    "rhel.8-arm64",
+    "rhel.8",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.8.8-x64": [
+    "rhel.8.8-x64",
+    "rhel.8.8",
+    "rhel.8.7-x64",
+    "rhel.8.7",
+    "rhel.8.6-x64",
+    "rhel.8.6",
+    "rhel.8.5-x64",
+    "rhel.8.5",
+    "rhel.8.4-x64",
+    "rhel.8.4",
+    "rhel.8.3-x64",
+    "rhel.8.3",
+    "rhel.8.2-x64",
+    "rhel.8.2",
+    "rhel.8.1-x64",
+    "rhel.8.1",
+    "rhel.8.0-x64",
+    "rhel.8.0",
+    "rhel.8-x64",
+    "rhel.8",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel.9": [
     "rhel.9",
     "rhel",
@@ -7179,6 +9046,132 @@
     "any",
     "base"
   ],
+  "rhel.9.0": [
+    "rhel.9.0",
+    "rhel.9",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.0-arm64": [
+    "rhel.9.0-arm64",
+    "rhel.9.0",
+    "rhel.9-arm64",
+    "rhel.9",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.0-x64": [
+    "rhel.9.0-x64",
+    "rhel.9.0",
+    "rhel.9-x64",
+    "rhel.9",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.1": [
+    "rhel.9.1",
+    "rhel.9.0",
+    "rhel.9",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.1-arm64": [
+    "rhel.9.1-arm64",
+    "rhel.9.1",
+    "rhel.9.0-arm64",
+    "rhel.9.0",
+    "rhel.9-arm64",
+    "rhel.9",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.1-x64": [
+    "rhel.9.1-x64",
+    "rhel.9.1",
+    "rhel.9.0-x64",
+    "rhel.9.0",
+    "rhel.9-x64",
+    "rhel.9",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.2": [
+    "rhel.9.2",
+    "rhel.9.1",
+    "rhel.9.0",
+    "rhel.9",
+    "rhel",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.2-arm64": [
+    "rhel.9.2-arm64",
+    "rhel.9.2",
+    "rhel.9.1-arm64",
+    "rhel.9.1",
+    "rhel.9.0-arm64",
+    "rhel.9.0",
+    "rhel.9-arm64",
+    "rhel.9",
+    "rhel-arm64",
+    "rhel",
+    "linux-arm64",
+    "linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "rhel.9.2-x64": [
+    "rhel.9.2-x64",
+    "rhel.9.2",
+    "rhel.9.1-x64",
+    "rhel.9.1",
+    "rhel.9.0-x64",
+    "rhel.9.0",
+    "rhel.9-x64",
+    "rhel.9",
+    "rhel-x64",
+    "rhel",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "sles": [
     "sles",
     "linux",
@@ -10296,4 +12289,4 @@
     "any",
     "base"
   ]
-}
\ No newline at end of file
+}
diff -Nur a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
--- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json	2023-05-12 11:57:35.749485802 -0700
+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json	2023-05-12 12:13:57.923241424 -0700
@@ -2050,6 +2050,12 @@
         "rhel"
       ]
     },
+    "ol-arm64": {
+      "#import": [
+        "ol",
+        "rhel-arm64"
+      ]
+    },
     "ol-x64": {
       "#import": [
         "ol",
@@ -2160,12 +2166,58 @@
         "rhel.7.6-x64"
       ]
     },
+    "ol.7.7": {
+      "#import": [
+        "ol.7.6",
+        "rhel.7.7"
+      ]
+    },
+    "ol.7.7-x64": {
+      "#import": [
+        "ol.7.7",
+        "ol.7.6-x64",
+        "rhel.7.7-x64"
+      ]
+    },
+    "ol.7.8": {
+      "#import": [
+        "ol.7.7",
+        "rhel.7.8"
+      ]
+    },
+    "ol.7.8-x64": {
+      "#import": [
+        "ol.7.8",
+        "ol.7.7-x64",
+        "rhel.7.8-x64"
+      ]
+    },
+    "ol.7.9": {
+      "#import": [
+        "ol.7.8",
+        "rhel.7.9"
+      ]
+    },
+    "ol.7.9-x64": {
+      "#import": [
+        "ol.7.9",
+        "ol.7.8-x64",
+        "rhel.7.9-x64"
+      ]
+    },
     "ol.8": {
       "#import": [
         "ol",
         "rhel.8"
       ]
     },
+    "ol.8-arm64": {
+      "#import": [
+        "ol.8",
+        "ol-arm64",
+        "rhel.8-arm64"
+      ]
+    },
     "ol.8-x64": {
       "#import": [
         "ol.8",
@@ -2179,6 +2231,13 @@
         "rhel.8.0"
       ]
     },
+    "ol.8.0-arm64": {
+      "#import": [
+        "ol.8.0",
+        "ol.8-arm64",
+        "rhel.8.0-arm64"
+      ]
+    },
     "ol.8.0-x64": {
       "#import": [
         "ol.8.0",
@@ -2186,6 +2245,246 @@
         "rhel.8.0-x64"
       ]
     },
+    "ol.8.1": {
+      "#import": [
+        "ol.8.0",
+        "rhel.8.1"
+      ]
+    },
+    "ol.8.1-arm64": {
+      "#import": [
+        "ol.8.1",
+        "ol.8.0-arm64",
+        "rhel.8.1-arm64"
+      ]
+    },
+    "ol.8.1-x64": {
+      "#import": [
+        "ol.8.1",
+        "ol.8.0-x64",
+        "rhel.8.1-x64"
+      ]
+    },
+    "ol.8.2": {
+      "#import": [
+        "ol.8.1",
+        "rhel.8.2"
+      ]
+    },
+    "ol.8.2-arm64": {
+      "#import": [
+        "ol.8.2",
+        "ol.8.1-arm64",
+        "rhel.8.2-arm64"
+      ]
+    },
+    "ol.8.2-x64": {
+      "#import": [
+        "ol.8.2",
+        "ol.8.1-x64",
+        "rhel.8.2-x64"
+      ]
+    },
+    "ol.8.3": {
+      "#import": [
+        "ol.8.2",
+        "rhel.8.3"
+      ]
+    },
+    "ol.8.3-arm64": {
+      "#import": [
+        "ol.8.3",
+        "ol.8.2-arm64",
+        "rhel.8.3-arm64"
+      ]
+    },
+    "ol.8.3-x64": {
+      "#import": [
+        "ol.8.3",
+        "ol.8.2-x64",
+        "rhel.8.3-x64"
+      ]
+    },
+    "ol.8.4": {
+      "#import": [
+        "ol.8.3",
+        "rhel.8.4"
+      ]
+    },
+    "ol.8.4-arm64": {
+      "#import": [
+        "ol.8.4",
+        "ol.8.3-arm64",
+        "rhel.8.4-arm64"
+      ]
+    },
+    "ol.8.4-x64": {
+      "#import": [
+        "ol.8.4",
+        "ol.8.3-x64",
+        "rhel.8.4-x64"
+      ]
+    },
+    "ol.8.5": {
+      "#import": [
+        "ol.8.4",
+        "rhel.8.5"
+      ]
+    },
+    "ol.8.5-arm64": {
+      "#import": [
+        "ol.8.5",
+        "ol.8.4-arm64",
+        "rhel.8.5-arm64"
+      ]
+    },
+    "ol.8.5-x64": {
+      "#import": [
+        "ol.8.5",
+        "ol.8.4-x64",
+        "rhel.8.5-x64"
+      ]
+    },
+    "ol.8.6": {
+      "#import": [
+        "ol.8.5",
+        "rhel.8.6"
+      ]
+    },
+    "ol.8.6-arm64": {
+      "#import": [
+        "ol.8.6",
+        "ol.8.5-arm64",
+        "rhel.8.6-arm64"
+      ]
+    },
+    "ol.8.6-x64": {
+      "#import": [
+        "ol.8.6",
+        "ol.8.5-x64",
+        "rhel.8.6-x64"
+      ]
+    },
+    "ol.8.7": {
+      "#import": [
+        "ol.8.6",
+        "rhel.8.7"
+      ]
+    },
+    "ol.8.7-arm64": {
+      "#import": [
+        "ol.8.7",
+        "ol.8.6-arm64",
+        "rhel.8.7-arm64"
+      ]
+    },
+    "ol.8.7-x64": {
+      "#import": [
+        "ol.8.7",
+        "ol.8.6-x64",
+        "rhel.8.7-x64"
+      ]
+    },
+    "ol.8.8": {
+      "#import": [
+        "ol.8.7",
+        "rhel.8.8"
+      ]
+    },
+    "ol.8.8-arm64": {
+      "#import": [
+        "ol.8.8",
+        "ol.8.7-arm64",
+        "rhel.8.8-arm64"
+      ]
+    },
+    "ol.8.8-x64": {
+      "#import": [
+        "ol.8.8",
+        "ol.8.7-x64",
+        "rhel.8.8-x64"
+      ]
+    },
+    "ol.9": {
+      "#import": [
+        "ol",
+        "rhel.9"
+      ]
+    },
+    "ol.9-arm64": {
+      "#import": [
+        "ol.9",
+        "ol-arm64",
+        "rhel.9-arm64"
+      ]
+    },
+    "ol.9-x64": {
+      "#import": [
+        "ol.9",
+        "ol-x64",
+        "rhel.9-x64"
+      ]
+    },
+    "ol.9.0": {
+      "#import": [
+        "ol.9",
+        "rhel.9.0"
+      ]
+    },
+    "ol.9.0-arm64": {
+      "#import": [
+        "ol.9.0",
+        "ol.9-arm64",
+        "rhel.9.0-arm64"
+      ]
+    },
+    "ol.9.0-x64": {
+      "#import": [
+        "ol.9.0",
+        "ol.9-x64",
+        "rhel.9.0-x64"
+      ]
+    },
+    "ol.9.1": {
+      "#import": [
+        "ol.9.0",
+        "rhel.9.1"
+      ]
+    },
+    "ol.9.1-arm64": {
+      "#import": [
+        "ol.9.1",
+        "ol.9.0-arm64",
+        "rhel.9.1-arm64"
+      ]
+    },
+    "ol.9.1-x64": {
+      "#import": [
+        "ol.9.1",
+        "ol.9.0-x64",
+        "rhel.9.1-x64"
+      ]
+    },
+    "ol.9.2": {
+      "#import": [
+        "ol.9.1",
+        "rhel.9.2"
+      ]
+    },
+    "ol.9.2-arm64": {
+      "#import": [
+        "ol.9.2",
+        "ol.9.1-arm64",
+        "rhel.9.2-arm64"
+      ]
+    },
+    "ol.9.2-x64": {
+      "#import": [
+        "ol.9.2",
+        "ol.9.1-x64",
+        "rhel.9.2-x64"
+      ]
+    },
     "omnios": {
       "#import": [
         "illumos"
@@ -2599,6 +2898,39 @@
         "rhel.7.5-x64"
       ]
     },
+    "rhel.7.7": {
+      "#import": [
+        "rhel.7.6"
+      ]
+    },
+    "rhel.7.7-x64": {
+      "#import": [
+        "rhel.7.7",
+        "rhel.7.6-x64"
+      ]
+    },
+    "rhel.7.8": {
+      "#import": [
+        "rhel.7.7"
+      ]
+    },
+    "rhel.7.8-x64": {
+      "#import": [
+        "rhel.7.8",
+        "rhel.7.7-x64"
+      ]
+    },
+    "rhel.7.9": {
+      "#import": [
+        "rhel.7.8"
+      ]
+    },
+    "rhel.7.9-x64": {
+      "#import": [
+        "rhel.7.9",
+        "rhel.7.8-x64"
+      ]
+    },
     "rhel.8": {
       "#import": [
         "rhel"
@@ -2650,6 +2982,125 @@
         "rhel.8.0-x64"
       ]
     },
+    "rhel.8.2": {
+      "#import": [
+        "rhel.8.1"
+      ]
+    },
+    "rhel.8.2-arm64": {
+      "#import": [
+        "rhel.8.2",
+        "rhel.8.1-arm64"
+      ]
+    },
+    "rhel.8.2-x64": {
+      "#import": [
+        "rhel.8.2",
+        "rhel.8.1-x64"
+      ]
+    },
+    "rhel.8.3": {
+      "#import": [
+        "rhel.8.2"
+      ]
+    },
+    "rhel.8.3-arm64": {
+      "#import": [
+        "rhel.8.3",
+        "rhel.8.2-arm64"
+      ]
+    },
+    "rhel.8.3-x64": {
+      "#import": [
+        "rhel.8.3",
+        "rhel.8.2-x64"
+      ]
+    },
+    "rhel.8.4": {
+      "#import": [
+        "rhel.8.3"
+      ]
+    },
+    "rhel.8.4-arm64": {
+      "#import": [
+        "rhel.8.4",
+        "rhel.8.3-arm64"
+      ]
+    },
+    "rhel.8.4-x64": {
+      "#import": [
+        "rhel.8.4",
+        "rhel.8.3-x64"
+      ]
+    },
+    "rhel.8.5": {
+      "#import": [
+        "rhel.8.4"
+      ]
+    },
+    "rhel.8.5-arm64": {
+      "#import": [
+        "rhel.8.5",
+        "rhel.8.4-arm64"
+      ]
+    },
+    "rhel.8.5-x64": {
+      "#import": [
+        "rhel.8.5",
+        "rhel.8.4-x64"
+      ]
+    },
+    "rhel.8.6": {
+      "#import": [
+        "rhel.8.5"
+      ]
+    },
+    "rhel.8.6-arm64": {
+      "#import": [
+        "rhel.8.6",
+        "rhel.8.5-arm64"
+      ]
+    },
+    "rhel.8.6-x64": {
+      "#import": [
+        "rhel.8.6",
+        "rhel.8.5-x64"
+      ]
+    },
+    "rhel.8.7": {
+      "#import": [
+        "rhel.8.6"
+      ]
+    },
+    "rhel.8.7-arm64": {
+      "#import": [
+        "rhel.8.7",
+        "rhel.8.6-arm64"
+      ]
+    },
+    "rhel.8.7-x64": {
+      "#import": [
+        "rhel.8.7",
+        "rhel.8.6-x64"
+      ]
+    },
+    "rhel.8.8": {
+      "#import": [
+        "rhel.8.7"
+      ]
+    },
+    "rhel.8.8-arm64": {
+      "#import": [
+        "rhel.8.8",
+        "rhel.8.7-arm64"
+      ]
+    },
+    "rhel.8.8-x64": {
+      "#import": [
+        "rhel.8.8",
+        "rhel.8.7-x64"
+      ]
+    },
     "rhel.9": {
       "#import": [
         "rhel"
@@ -2667,6 +3118,57 @@
         "rhel-x64"
       ]
     },
+    "rhel.9.0": {
+      "#import": [
+        "rhel.9"
+      ]
+    },
+    "rhel.9.0-arm64": {
+      "#import": [
+        "rhel.9.0",
+        "rhel.9-arm64"
+      ]
+    },
+    "rhel.9.0-x64": {
+      "#import": [
+        "rhel.9.0",
+        "rhel.9-x64"
+      ]
+    },
+    "rhel.9.1": {
+      "#import": [
+        "rhel.9.0"
+      ]
+    },
+    "rhel.9.1-arm64": {
+      "#import": [
+        "rhel.9.1",
+        "rhel.9.0-arm64"
+      ]
+    },
+    "rhel.9.1-x64": {
+      "#import": [
+        "rhel.9.1",
+        "rhel.9.0-x64"
+      ]
+    },
+    "rhel.9.2": {
+      "#import": [
+        "rhel.9.1"
+      ]
+    },
+    "rhel.9.2-arm64": {
+      "#import": [
+        "rhel.9.2",
+        "rhel.9.1-arm64"
+      ]
+    },
+    "rhel.9.2-x64": {
+      "#import": [
+        "rhel.9.2",
+        "rhel.9.1-x64"
+      ]
+    },
     "rocky": {
       "#import": [
         "rhel"
diff -Nur a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
--- a/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props	2023-05-12 13:38:12.825821321 -0700
+++ b/src/runtime/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props	2023-05-12 12:04:38.212120321 -0700
@@ -134,13 +134,19 @@
     <RuntimeGroup Include="ol">
       <Parent>rhel</Parent>
       <Architectures>x64</Architectures>
-      <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6</Versions>
+      <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6;7.7;7.8;7.9</Versions>
       <ApplyVersionsToParent>true</ApplyVersionsToParent>
     </RuntimeGroup>
     <RuntimeGroup Include="ol">
       <Parent>rhel</Parent>
-      <Architectures>x64</Architectures>
-      <Versions>8;8.0</Versions>
+      <Architectures>x64;arm64</Architectures>
+      <Versions>8;8.0;8.1;8.2;8.3;8.4;8.5;8.6;8.7;8.8</Versions>
+      <ApplyVersionsToParent>true</ApplyVersionsToParent>
+    </RuntimeGroup>
+    <RuntimeGroup Include="ol">
+      <Parent>rhel</Parent>
+      <Architectures>x64;arm64</Architectures>
+      <Versions>9;9.0;9.1;9.2</Versions>
       <ApplyVersionsToParent>true</ApplyVersionsToParent>
     </RuntimeGroup>
 
@@ -202,17 +208,17 @@
     <RuntimeGroup Include="rhel">
       <Parent>linux</Parent>
       <Architectures>x64</Architectures>
-      <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6</Versions>
+      <Versions>7;7.0;7.1;7.2;7.3;7.4;7.5;7.6;7.7;7.8;7.9</Versions>
     </RuntimeGroup>
     <RuntimeGroup Include="rhel">
       <Parent>linux</Parent>
       <Architectures>x64;arm64</Architectures>
-      <Versions>8;8.0;8.1</Versions>
+      <Versions>8;8.0;8.1;8.2;8.3;8.4;8.5;8.6;8.7;8.8</Versions>
     </RuntimeGroup>
     <RuntimeGroup Include="rhel">
       <Parent>linux</Parent>
       <Architectures>x64;arm64</Architectures>
-      <Versions>9</Versions>
+      <Versions>9;9.0;9.1;9.2</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="rocky">
--
2.31.1