From bd98efe6adf4638d699f92d4b24bc6cdd5e0ca47 Mon Sep 17 00:00:00 2001
From: Marek Safar <marek.safar@gmail.com>
Date: Wed, 12 Feb 2020 19:00:10 +0100
Subject: [PATCH] Add basic RIDs for ios and tvos (#31953)

---
 .../runtime.compatibility.json                     | 278 +++++++++++++++++++++
 .../pkg/Microsoft.NETCore.Platforms/runtime.json   | 153 ++++++++++++
 .../runtimeGroups.props                            |  13 +
 3 files changed, 444 insertions(+)

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index 9bcc59b..3f4a792 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -1061,6 +1061,124 @@
     "any",
     "base"
   ],
+  "ios": [
+    "ios",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios-arm64": [
+    "ios-arm64",
+    "ios",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios-x64": [
+    "ios-x64",
+    "ios",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios.11": [
+    "ios.11",
+    "ios",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios.11-arm64": [
+    "ios.11-arm64",
+    "ios.11",
+    "ios-arm64",
+    "ios",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios.11-x64": [
+    "ios.11-x64",
+    "ios.11",
+    "ios-x64",
+    "ios",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios.12": [
+    "ios.12",
+    "ios.11",
+    "ios",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios.12-arm64": [
+    "ios.12-arm64",
+    "ios.12",
+    "ios.11-arm64",
+    "ios.11",
+    "ios-arm64",
+    "ios",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios.12-x64": [
+    "ios.12-x64",
+    "ios.12",
+    "ios.11-x64",
+    "ios.11",
+    "ios-x64",
+    "ios",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios.13": [
+    "ios.13",
+    "ios.12",
+    "ios.11",
+    "ios",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios.13-arm64": [
+    "ios.13-arm64",
+    "ios.13",
+    "ios.12-arm64",
+    "ios.12",
+    "ios.11-arm64",
+    "ios.11",
+    "ios-arm64",
+    "ios",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "ios.13-x64": [
+    "ios.13-x64",
+    "ios.13",
+    "ios.12-x64",
+    "ios.12",
+    "ios.11-x64",
+    "ios.11",
+    "ios-x64",
+    "ios",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "linux": [
     "linux",
     "unix",
@@ -3054,6 +3172,166 @@
     "any",
     "base"
   ],
+  "tvos": [
+    "tvos",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos-arm64": [
+    "tvos-arm64",
+    "tvos",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos-x64": [
+    "tvos-x64",
+    "tvos",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.10": [
+    "tvos.10",
+    "tvos",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.10-arm64": [
+    "tvos.10-arm64",
+    "tvos.10",
+    "tvos-arm64",
+    "tvos",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.10-x64": [
+    "tvos.10-x64",
+    "tvos.10",
+    "tvos-x64",
+    "tvos",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.11": [
+    "tvos.11",
+    "tvos.10",
+    "tvos",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.11-arm64": [
+    "tvos.11-arm64",
+    "tvos.11",
+    "tvos.10-arm64",
+    "tvos.10",
+    "tvos-arm64",
+    "tvos",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.11-x64": [
+    "tvos.11-x64",
+    "tvos.11",
+    "tvos.10-x64",
+    "tvos.10",
+    "tvos-x64",
+    "tvos",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.12": [
+    "tvos.12",
+    "tvos.11",
+    "tvos.10",
+    "tvos",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.12-arm64": [
+    "tvos.12-arm64",
+    "tvos.12",
+    "tvos.11-arm64",
+    "tvos.11",
+    "tvos.10-arm64",
+    "tvos.10",
+    "tvos-arm64",
+    "tvos",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.12-x64": [
+    "tvos.12-x64",
+    "tvos.12",
+    "tvos.11-x64",
+    "tvos.11",
+    "tvos.10-x64",
+    "tvos.10",
+    "tvos-x64",
+    "tvos",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.13": [
+    "tvos.13",
+    "tvos.12",
+    "tvos.11",
+    "tvos.10",
+    "tvos",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.13-arm64": [
+    "tvos.13-arm64",
+    "tvos.13",
+    "tvos.12-arm64",
+    "tvos.12",
+    "tvos.11-arm64",
+    "tvos.11",
+    "tvos.10-arm64",
+    "tvos.10",
+    "tvos-arm64",
+    "tvos",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tvos.13-x64": [
+    "tvos.13-x64",
+    "tvos.13",
+    "tvos.12-x64",
+    "tvos.12",
+    "tvos.11-x64",
+    "tvos.11",
+    "tvos.10-x64",
+    "tvos.10",
+    "tvos-x64",
+    "tvos",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "ubuntu": [
     "ubuntu",
     "debian",
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
index 8d6f6ee..7da9d5c 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -554,6 +554,74 @@
         "linux-x64"
       ]
     },
+    "ios": {
+      "#import": [
+        "unix"
+      ]
+    },
+    "ios-arm64": {
+      "#import": [
+        "ios",
+        "unix-arm64"
+      ]
+    },
+    "ios-x64": {
+      "#import": [
+        "ios",
+        "unix-x64"
+      ]
+    },
+    "ios.11": {
+      "#import": [
+        "ios"
+      ]
+    },
+    "ios.11-arm64": {
+      "#import": [
+        "ios.11",
+        "ios-arm64"
+      ]
+    },
+    "ios.11-x64": {
+      "#import": [
+        "ios.11",
+        "ios-x64"
+      ]
+    },
+    "ios.12": {
+      "#import": [
+        "ios.11"
+      ]
+    },
+    "ios.12-arm64": {
+      "#import": [
+        "ios.12",
+        "ios.11-arm64"
+      ]
+    },
+    "ios.12-x64": {
+      "#import": [
+        "ios.12",
+        "ios.11-x64"
+      ]
+    },
+    "ios.13": {
+      "#import": [
+        "ios.12"
+      ]
+    },
+    "ios.13-arm64": {
+      "#import": [
+        "ios.13",
+        "ios.12-arm64"
+      ]
+    },
+    "ios.13-x64": {
+      "#import": [
+        "ios.13",
+        "ios.12-x64"
+      ]
+    },
     "linux": {
       "#import": [
         "unix"
@@ -1380,6 +1448,91 @@
         "tizen.5.5.0-x86"
       ]
     },
+    "tvos": {
+      "#import": [
+        "unix"
+      ]
+    },
+    "tvos-arm64": {
+      "#import": [
+        "tvos",
+        "unix-arm64"
+      ]
+    },
+    "tvos-x64": {
+      "#import": [
+        "tvos",
+        "unix-x64"
+      ]
+    },
+    "tvos.10": {
+      "#import": [
+        "tvos"
+      ]
+    },
+    "tvos.10-arm64": {
+      "#import": [
+        "tvos.10",
+        "tvos-arm64"
+      ]
+    },
+    "tvos.10-x64": {
+      "#import": [
+        "tvos.10",
+        "tvos-x64"
+      ]
+    },
+    "tvos.11": {
+      "#import": [
+        "tvos.10"
+      ]
+    },
+    "tvos.11-arm64": {
+      "#import": [
+        "tvos.11",
+        "tvos.10-arm64"
+      ]
+    },
+    "tvos.11-x64": {
+      "#import": [
+        "tvos.11",
+        "tvos.10-x64"
+      ]
+    },
+    "tvos.12": {
+      "#import": [
+        "tvos.11"
+      ]
+    },
+    "tvos.12-arm64": {
+      "#import": [
+        "tvos.12",
+        "tvos.11-arm64"
+      ]
+    },
+    "tvos.12-x64": {
+      "#import": [
+        "tvos.12",
+        "tvos.11-x64"
+      ]
+    },
+    "tvos.13": {
+      "#import": [
+        "tvos.12"
+      ]
+    },
+    "tvos.13-arm64": {
+      "#import": [
+        "tvos.13",
+        "tvos.12-arm64"
+      ]
+    },
+    "tvos.13-x64": {
+      "#import": [
+        "tvos.13",
+        "tvos.12-x64"
+      ]
+    },
     "ubuntu": {
       "#import": [
         "debian"
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index b6ac632..b4f2178 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -57,6 +57,13 @@
       <Architectures>x64</Architectures>
     </RuntimeGroup>
 
+    <RuntimeGroup Include="ios">
+      <Parent>unix</Parent>
+      <Architectures>arm64;x64</Architectures>
+      <!-- starting from 11 because 10 will need different graph with arm included -->
+      <Versions>11;12;13</Versions>
+    </RuntimeGroup>
+
     <!-- linux mint includes major version in Include because Parent is different for each major -->
     <RuntimeGroup Include="linuxmint.17">
       <Parent>ubuntu.14.04</Parent>
@@ -137,6 +144,12 @@
       <Versions>4.0.0;5.0.0;5.5.0;6.0.0</Versions>
     </RuntimeGroup>
 
+    <RuntimeGroup Include="tvos">
+      <Parent>unix</Parent>
+      <Architectures>arm64;x64</Architectures>
+      <Versions>10;11;12;13</Versions>
+    </RuntimeGroup>
+
     <RuntimeGroup Include="ubuntu">
       <Parent>debian</Parent>
       <Architectures>x64;x86;arm</Architectures>
-- 
2.7.4