From c2fc6b6a63b184c44d5069a91e8f580be8a245ce Mon Sep 17 00:00:00 2001
From: vitek-karas <vitek.karas@microsoft.com>
Date: Thu, 2 Sep 2021 14:01:48 -0700
Subject: [PATCH] Add Win11 RIDs

---
 .../src/runtime.compatibility.json            | 207 ++++++++++++++++++
 .../src/runtime.json                          |  67 ++++++
 .../src/runtimeGroups.props                   |   2 +-
 3 files changed, 275 insertions(+), 1 deletion(-)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index 73f850600c6d39..6ed7c9d3561c19 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -8216,6 +8216,213 @@
     "any",
     "base"
   ],
+  "win11": [
+    "win11",
+    "win10",
+    "win81",
+    "win8",
+    "win7",
+    "win",
+    "any",
+    "base"
+  ],
+  "win11-aot": [
+    "win11-aot",
+    "win11",
+    "win10-aot",
+    "win10",
+    "win81-aot",
+    "win81",
+    "win8-aot",
+    "win8",
+    "win7-aot",
+    "win7",
+    "win-aot",
+    "win",
+    "aot",
+    "any",
+    "base"
+  ],
+  "win11-arm": [
+    "win11-arm",
+    "win11",
+    "win10-arm",
+    "win10",
+    "win81-arm",
+    "win81",
+    "win8-arm",
+    "win8",
+    "win7-arm",
+    "win7",
+    "win-arm",
+    "win",
+    "any",
+    "base"
+  ],
+  "win11-arm-aot": [
+    "win11-arm-aot",
+    "win11-aot",
+    "win11-arm",
+    "win11",
+    "win10-arm-aot",
+    "win10-aot",
+    "win10-arm",
+    "win10",
+    "win81-arm-aot",
+    "win81-aot",
+    "win81-arm",
+    "win81",
+    "win8-arm-aot",
+    "win8-aot",
+    "win8-arm",
+    "win8",
+    "win7-arm-aot",
+    "win7-aot",
+    "win7-arm",
+    "win7",
+    "win-arm-aot",
+    "win-aot",
+    "win-arm",
+    "win",
+    "aot",
+    "any",
+    "base"
+  ],
+  "win11-arm64": [
+    "win11-arm64",
+    "win11",
+    "win10-arm64",
+    "win10",
+    "win81-arm64",
+    "win81",
+    "win8-arm64",
+    "win8",
+    "win7-arm64",
+    "win7",
+    "win-arm64",
+    "win",
+    "any",
+    "base"
+  ],
+  "win11-arm64-aot": [
+    "win11-arm64-aot",
+    "win11-aot",
+    "win11-arm64",
+    "win11",
+    "win10-arm64-aot",
+    "win10-aot",
+    "win10-arm64",
+    "win10",
+    "win81-arm64-aot",
+    "win81-aot",
+    "win81-arm64",
+    "win81",
+    "win8-arm64-aot",
+    "win8-aot",
+    "win8-arm64",
+    "win8",
+    "win7-arm64-aot",
+    "win7-aot",
+    "win7-arm64",
+    "win7",
+    "win-arm64-aot",
+    "win-aot",
+    "win-arm64",
+    "win",
+    "aot",
+    "any",
+    "base"
+  ],
+  "win11-x64": [
+    "win11-x64",
+    "win11",
+    "win10-x64",
+    "win10",
+    "win81-x64",
+    "win81",
+    "win8-x64",
+    "win8",
+    "win7-x64",
+    "win7",
+    "win-x64",
+    "win",
+    "any",
+    "base"
+  ],
+  "win11-x64-aot": [
+    "win11-x64-aot",
+    "win11-aot",
+    "win11-x64",
+    "win11",
+    "win10-x64-aot",
+    "win10-aot",
+    "win10-x64",
+    "win10",
+    "win81-x64-aot",
+    "win81-aot",
+    "win81-x64",
+    "win81",
+    "win8-x64-aot",
+    "win8-aot",
+    "win8-x64",
+    "win8",
+    "win7-x64-aot",
+    "win7-aot",
+    "win7-x64",
+    "win7",
+    "win-x64-aot",
+    "win-aot",
+    "win-x64",
+    "win",
+    "aot",
+    "any",
+    "base"
+  ],
+  "win11-x86": [
+    "win11-x86",
+    "win11",
+    "win10-x86",
+    "win10",
+    "win81-x86",
+    "win81",
+    "win8-x86",
+    "win8",
+    "win7-x86",
+    "win7",
+    "win-x86",
+    "win",
+    "any",
+    "base"
+  ],
+  "win11-x86-aot": [
+    "win11-x86-aot",
+    "win11-aot",
+    "win11-x86",
+    "win11",
+    "win10-x86-aot",
+    "win10-aot",
+    "win10-x86",
+    "win10",
+    "win81-x86-aot",
+    "win81-aot",
+    "win81-x86",
+    "win81",
+    "win8-x86-aot",
+    "win8-aot",
+    "win8-x86",
+    "win8",
+    "win7-x86-aot",
+    "win7-aot",
+    "win7-x86",
+    "win7",
+    "win-x86-aot",
+    "win-aot",
+    "win-x86",
+    "win",
+    "aot",
+    "any",
+    "base"
+  ],
   "win7": [
     "win7",
     "win",
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
index 7a35c19e18a97b..554fb99988ac75 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -3478,6 +3478,73 @@
         "win81-x86-aot"
       ]
     },
+    "win11": {
+      "#import": [
+        "win10"
+      ]
+    },
+    "win11-aot": {
+      "#import": [
+        "win11",
+        "win10-aot"
+      ]
+    },
+    "win11-arm": {
+      "#import": [
+        "win11",
+        "win10-arm"
+      ]
+    },
+    "win11-arm-aot": {
+      "#import": [
+        "win11-aot",
+        "win11-arm",
+        "win11",
+        "win10-arm-aot"
+      ]
+    },
+    "win11-arm64": {
+      "#import": [
+        "win11",
+        "win10-arm64"
+      ]
+    },
+    "win11-arm64-aot": {
+      "#import": [
+        "win11-aot",
+        "win11-arm64",
+        "win11",
+        "win10-arm64-aot"
+      ]
+    },
+    "win11-x64": {
+      "#import": [
+        "win11",
+        "win10-x64"
+      ]
+    },
+    "win11-x64-aot": {
+      "#import": [
+        "win11-aot",
+        "win11-x64",
+        "win11",
+        "win10-x64-aot"
+      ]
+    },
+    "win11-x86": {
+      "#import": [
+        "win11",
+        "win10-x86"
+      ]
+    },
+    "win11-x86-aot": {
+      "#import": [
+        "win11-aot",
+        "win11-x86",
+        "win11",
+        "win10-x86-aot"
+      ]
+    },
     "win7": {
       "#import": [
         "win"
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
index c2973fd73e3dd7..71fae4d9d2c204 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -246,7 +246,7 @@
       <OmitVersionDelimiter>true</OmitVersionDelimiter>
       <AdditionalQualifiers>aot</AdditionalQualifiers>
       <Architectures>x64;x86;arm;arm64</Architectures>
-      <Versions>7;8;81;10</Versions>
+      <Versions>7;8;81;10;11</Versions>
     </RuntimeGroup>
     <!-- add corert to all RIDs -->
     <RuntimeGroupWithQualifiers Include="@(RuntimeGroup)" />