diff --git a/eng/native/init-distro-rid.sh b/eng/native/init-distro-rid.sh
index a380367e60e6c..3184bcf38ad87 100644
--- a/eng/native/init-distro-rid.sh
+++ b/eng/native/init-distro-rid.sh
@@ -41,7 +41,7 @@ initNonPortableDistroRid()
# We have forced __PortableBuild=0. This is because -portablebuld
# has been passed as false.
if (( isPortable == 0 )); then
- if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then
+ if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" || "${ID}" == "ol" ]]; then
# remove the last version digit
VERSION_ID="${VERSION_ID%.*}"
fi
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index 926d654022362..f76736fa5eb87 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -6385,6 +6385,18 @@
"any",
"base"
],
+ "ol-arm64": [
+ "ol-arm64",
+ "ol",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
"ol-x64": [
"ol-x64",
"ol",
@@ -6773,23 +6785,71 @@
"any",
"base"
],
- "ol.8": [
- "ol.8",
+ "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.8",
+ "rhel.7",
"rhel",
"linux",
"unix",
"any",
"base"
],
- "ol.8-x64": [
- "ol.8-x64",
- "ol.8",
+ "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.8-x64",
+ "rhel.7-x64",
"ol",
- "rhel.8",
+ "rhel.7",
"rhel-x64",
"rhel",
"linux-x64",
@@ -6799,29 +6859,77 @@
"any",
"base"
],
- "ol.8.0": [
- "ol.8.0",
- "ol.8",
- "rhel.8.0",
+ "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.8",
+ "rhel.7",
"rhel",
"linux",
"unix",
"any",
"base"
],
- "ol.8.0-x64": [
- "ol.8.0-x64",
- "ol.8.0",
- "ol.8-x64",
- "rhel.8.0-x64",
- "ol.8",
- "rhel.8.0",
+ "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.8-x64",
+ "rhel.7-x64",
"ol",
- "rhel.8",
+ "rhel.7",
"rhel-x64",
"rhel",
"linux-x64",
@@ -6831,71 +6939,932 @@
"any",
"base"
],
- "omnios": [
- "omnios",
- "illumos",
+ "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"
],
- "omnios-x64": [
- "omnios-x64",
- "omnios",
- "illumos-x64",
- "illumos",
+ "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"
],
- "omnios.15": [
- "omnios.15",
- "omnios",
- "illumos",
- "unix",
- "any",
- "base"
- ],
- "omnios.15-x64": [
- "omnios.15-x64",
- "omnios.15",
- "omnios-x64",
- "omnios",
- "illumos-x64",
- "illumos",
- "unix-x64",
+ "ol.8": [
+ "ol.8",
+ "ol",
+ "rhel.8",
+ "rhel",
+ "linux",
"unix",
"any",
"base"
],
- "openindiana": [
- "openindiana",
- "illumos",
+ "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"
],
- "openindiana-x64": [
- "openindiana-x64",
- "openindiana",
- "illumos-x64",
- "illumos",
+ "ol.8-x64": [
+ "ol.8-x64",
+ "ol.8",
+ "ol-x64",
+ "rhel.8-x64",
+ "ol",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
"unix-x64",
"unix",
"any",
"base"
],
- "opensuse": [
- "opensuse",
+ "ol.8.0": [
+ "ol.8.0",
+ "ol.8",
+ "rhel.8.0",
+ "ol",
+ "rhel.8",
+ "rhel",
"linux",
"unix",
"any",
"base"
],
- "opensuse-x64": [
- "opensuse-x64",
- "opensuse",
- "linux-x64",
+ "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",
+ "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.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.9": [
+ "ol.9",
+ "ol",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "ol.9-arm64": [
+ "ol.9-arm64",
+ "ol.9",
+ "ol-arm64",
+ "ol",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "ol.9-x64": [
+ "ol.9-x64",
+ "ol.9",
+ "ol-x64",
+ "ol",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "omnios": [
+ "omnios",
+ "illumos",
+ "unix",
+ "any",
+ "base"
+ ],
+ "omnios-x64": [
+ "omnios-x64",
+ "omnios",
+ "illumos-x64",
+ "illumos",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "omnios.15": [
+ "omnios.15",
+ "omnios",
+ "illumos",
+ "unix",
+ "any",
+ "base"
+ ],
+ "omnios.15-x64": [
+ "omnios.15-x64",
+ "omnios.15",
+ "omnios-x64",
+ "omnios",
+ "illumos-x64",
+ "illumos",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "openindiana": [
+ "openindiana",
+ "illumos",
+ "unix",
+ "any",
+ "base"
+ ],
+ "openindiana-x64": [
+ "openindiana-x64",
+ "openindiana",
+ "illumos-x64",
+ "illumos",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "opensuse": [
+ "opensuse",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "opensuse-x64": [
+ "opensuse-x64",
+ "opensuse",
+ "linux-x64",
"linux",
"unix-x64",
"unix",
@@ -7716,7 +8685,124 @@
"any",
"base"
],
- "rhel.7.4": [
+ "rhel.7.4": [
+ "rhel.7.4",
+ "rhel.7.3",
+ "rhel.7.2",
+ "rhel.7.1",
+ "rhel.7.0",
+ "rhel.7",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rhel.7.4-x64": [
+ "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.5": [
+ "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.5-x64": [
+ "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.6": [
+ "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.6-x64": [
+ "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.7": [
+ "rhel.7.7",
+ "rhel.7.6",
+ "rhel.7.5",
"rhel.7.4",
"rhel.7.3",
"rhel.7.2",
@@ -7729,7 +8815,13 @@
"any",
"base"
],
- "rhel.7.4-x64": [
+ "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",
@@ -7751,7 +8843,10 @@
"any",
"base"
],
- "rhel.7.5": [
+ "rhel.7.8": [
+ "rhel.7.8",
+ "rhel.7.7",
+ "rhel.7.6",
"rhel.7.5",
"rhel.7.4",
"rhel.7.3",
@@ -7765,7 +8860,13 @@
"any",
"base"
],
- "rhel.7.5-x64": [
+ "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",
@@ -7789,7 +8890,10 @@
"any",
"base"
],
- "rhel.7.6": [
+ "rhel.7.9": [
+ "rhel.7.9",
+ "rhel.7.8",
+ "rhel.7.7",
"rhel.7.6",
"rhel.7.5",
"rhel.7.4",
@@ -7804,7 +8908,13 @@
"any",
"base"
],
- "rhel.7.6-x64": [
+ "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",
@@ -7941,6 +9051,363 @@
"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.9": [
"rhel.9",
"rhel",
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
index eb865ee6422de..8c3721d80efff 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -2313,6 +2313,12 @@
"rhel"
]
},
+ "ol-arm64": {
+ "#import": [
+ "ol",
+ "rhel-arm64"
+ ]
+ },
"ol-x64": {
"#import": [
"ol",
@@ -2423,12 +2429,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",
@@ -2442,6 +2494,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",
@@ -2449,6 +2508,163 @@
"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.9": {
+ "#import": [
+ "ol"
+ ]
+ },
+ "ol.9-arm64": {
+ "#import": [
+ "ol.9",
+ "ol-arm64"
+ ]
+ },
+ "ol.9-x64": {
+ "#import": [
+ "ol.9",
+ "ol-x64"
+ ]
+ },
"omnios": {
"#import": [
"illumos"
@@ -2862,6 +3078,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"
@@ -2913,6 +3162,108 @@
"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.9": {
"#import": [
"rhel"
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
index 08327c9c112c8..3249a21673871 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -157,15 +157,20 @@
rhel
x64
- 7;7.0;7.1;7.2;7.3;7.4;7.5;7.6
+ 7;7.0;7.1;7.2;7.3;7.4;7.5;7.6;7.7;7.8;7.9
true
rhel
- x64
- 8;8.0
+ x64;arm64
+ 8;8.0;8.1;8.2;8.3;8.4;8.5;8.6;8.7
true
+
+ rhel
+ x64;arm64
+ 9
+
@@ -225,12 +230,12 @@
linux
x64
- 7;7.0;7.1;7.2;7.3;7.4;7.5;7.6
+ 7;7.0;7.1;7.2;7.3;7.4;7.5;7.6;7.7;7.8;7.9
linux
x64;arm64
- 8;8.0;8.1
+ 8;8.0;8.1;8.2;8.3;8.4;8.5;8.6;8.7
linux
diff --git a/src/native/corehost/hostmisc/pal.unix.cpp b/src/native/corehost/hostmisc/pal.unix.cpp
index fafcb90d679f0..e975910d5eb86 100644
--- a/src/native/corehost/hostmisc/pal.unix.cpp
+++ b/src/native/corehost/hostmisc/pal.unix.cpp
@@ -768,6 +768,7 @@ pal::string_t normalize_linux_rid(pal::string_t rid)
pal::string_t rhelPrefix(_X("rhel."));
pal::string_t alpinePrefix(_X("alpine."));
pal::string_t rockyPrefix(_X("rocky."));
+ pal::string_t olPrefix(_X("ol."));
size_t lastVersionSeparatorIndex = std::string::npos;
if (rid.compare(0, rhelPrefix.length(), rhelPrefix) == 0)
@@ -786,6 +787,10 @@ pal::string_t normalize_linux_rid(pal::string_t rid)
{
lastVersionSeparatorIndex = rid.find(_X("."), rockyPrefix.length());
}
+ else if (rid.compare(0, olPrefix.length(), olPrefix) == 0)
+ {
+ lastVersionSeparatorIndex = rid.find(_X("."), olPrefix.length());
+ }
if (lastVersionSeparatorIndex != std::string::npos)
{