From 77093d87bd2f9065b89749f75e0c93d65dc72cb1 Mon Sep 17 00:00:00 2001
From: Swift Kim <swift.kim@samsung.com>
Date: Thu, 23 Jan 2020 17:32:19 +0900
Subject: [PATCH] Add missing RIDs for Tizen (5.5.0, 6.0.0) (#2003)

---
 .../runtime.compatibility.json                     | 89 ++++++++++++++++++++++
 .../pkg/Microsoft.NETCore.Platforms/runtime.json   | 34 +++++++++
 .../runtimeGroups.props                            |  2 +-
 3 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index d273634..9bcc59b 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -2965,6 +2965,95 @@
     "any",
     "base"
   ],
+  "tizen.5.5.0": [
+    "tizen.5.5.0",
+    "tizen.5.0.0",
+    "tizen.4.0.0",
+    "tizen",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.5.5.0-armel": [
+    "tizen.5.5.0-armel",
+    "tizen.5.5.0",
+    "tizen.5.0.0-armel",
+    "tizen.5.0.0",
+    "tizen.4.0.0-armel",
+    "tizen.4.0.0",
+    "tizen-armel",
+    "tizen",
+    "linux-armel",
+    "linux",
+    "unix-armel",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.5.5.0-x86": [
+    "tizen.5.5.0-x86",
+    "tizen.5.5.0",
+    "tizen.5.0.0-x86",
+    "tizen.5.0.0",
+    "tizen.4.0.0-x86",
+    "tizen.4.0.0",
+    "tizen-x86",
+    "tizen",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.6.0.0": [
+    "tizen.6.0.0",
+    "tizen.5.5.0",
+    "tizen.5.0.0",
+    "tizen.4.0.0",
+    "tizen",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.6.0.0-armel": [
+    "tizen.6.0.0-armel",
+    "tizen.6.0.0",
+    "tizen.5.5.0-armel",
+    "tizen.5.5.0",
+    "tizen.5.0.0-armel",
+    "tizen.5.0.0",
+    "tizen.4.0.0-armel",
+    "tizen.4.0.0",
+    "tizen-armel",
+    "tizen",
+    "linux-armel",
+    "linux",
+    "unix-armel",
+    "unix",
+    "any",
+    "base"
+  ],
+  "tizen.6.0.0-x86": [
+    "tizen.6.0.0-x86",
+    "tizen.6.0.0",
+    "tizen.5.5.0-x86",
+    "tizen.5.5.0",
+    "tizen.5.0.0-x86",
+    "tizen.5.0.0",
+    "tizen.4.0.0-x86",
+    "tizen.4.0.0",
+    "tizen-x86",
+    "tizen",
+    "linux-x86",
+    "linux",
+    "unix-x86",
+    "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 5b2f70f..8d6f6ee 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -1346,6 +1346,40 @@
         "tizen.4.0.0-x86"
       ]
     },
+    "tizen.5.5.0": {
+      "#import": [
+        "tizen.5.0.0"
+      ]
+    },
+    "tizen.5.5.0-armel": {
+      "#import": [
+        "tizen.5.5.0",
+        "tizen.5.0.0-armel"
+      ]
+    },
+    "tizen.5.5.0-x86": {
+      "#import": [
+        "tizen.5.5.0",
+        "tizen.5.0.0-x86"
+      ]
+    },
+    "tizen.6.0.0": {
+      "#import": [
+        "tizen.5.5.0"
+      ]
+    },
+    "tizen.6.0.0-armel": {
+      "#import": [
+        "tizen.6.0.0",
+        "tizen.5.5.0-armel"
+      ]
+    },
+    "tizen.6.0.0-x86": {
+      "#import": [
+        "tizen.6.0.0",
+        "tizen.5.5.0-x86"
+      ]
+    },
     "ubuntu": {
       "#import": [
         "debian"
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index aa31cac..b6ac632 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -134,7 +134,7 @@
     <RuntimeGroup Include="tizen">
       <Parent>linux</Parent>
       <Architectures>x86;armel</Architectures>
-      <Versions>4.0.0;5.0.0</Versions>
+      <Versions>4.0.0;5.0.0;5.5.0;6.0.0</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="ubuntu">
-- 
2.7.4