From 4e3bb7e371c540dd7887ff2ed30ee448491f8916 Mon Sep 17 00:00:00 2001
From: Ulrich Weigand <ulrich.weigand@de.ibm.com>
Date: Tue, 18 May 2021 15:12:40 +0200
Subject: [PATCH] Add RID values for s390x

* Add Linux on the s390x architecture to runtimeGroups.props

* Update generated files
---
 .../src/runtime.compatibility.json            | 24 +++++++++++++++++++
 .../src/runtime.json                          | 17 +++++++++++++
 .../src/runtimeGroups.props                   |  6 ++---
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
index bf3295d6351e2f..6d11e65970e49c 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
@@ -3244,6 +3244,16 @@
     "any",
     "base"
   ],
+  "linux-musl-s390x": [
+    "linux-musl-s390x",
+    "linux-musl",
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "linux-musl-x64": [
     "linux-musl-x64",
     "linux-musl",
@@ -3264,6 +3274,14 @@
     "any",
     "base"
   ],
+  "linux-s390x": [
+    "linux-s390x",
+    "linux",
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "linux-x64": [
     "linux-x64",
     "linux",
@@ -7144,6 +7162,12 @@
     "any",
     "base"
   ],
+  "unix-s390x": [
+    "unix-s390x",
+    "unix",
+    "any",
+    "base"
+  ],
   "unix-x64": [
     "unix-x64",
     "unix",
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
index ee7d87d932971c..66693df64b8230 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
@@ -1377,6 +1377,12 @@
         "linux-armel"
       ]
     },
+    "linux-musl-s390x": {
+      "#import": [
+        "linux-musl",
+        "linux-s390x"
+      ]
+    },
     "linux-musl-x64": {
       "#import": [
         "linux-musl",
@@ -1389,6 +1395,12 @@
         "linux-x86"
       ]
     },
+    "linux-s390x": {
+      "#import": [
+        "linux",
+        "unix-s390x"
+      ]
+    },
     "linux-x64": {
       "#import": [
         "linux",
@@ -3083,6 +3095,11 @@
         "unix"
       ]
     },
+    "unix-s390x": {
+      "#import": [
+        "unix"
+      ]
+    },
     "unix-x64": {
       "#import": [
         "unix"
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
index e25d5148067b50..6344c99ae83908 100644
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
@@ -2,15 +2,15 @@
   <ItemGroup>
     <RuntimeGroup Include="unix">
       <Parent>any</Parent>
-      <Architectures>x64;x86;arm;armel;arm64;mips64</Architectures>
+      <Architectures>x64;x86;arm;armel;arm64;mips64;s390x</Architectures>
     </RuntimeGroup>
     <RuntimeGroup Include="linux">
       <Parent>unix</Parent>
-      <Architectures>x64;x86;arm;armel;arm64;mips64</Architectures>
+      <Architectures>x64;x86;arm;armel;arm64;mips64;s390x</Architectures>
     </RuntimeGroup>
     <RuntimeGroup Include="linux-musl">
       <Parent>linux</Parent>
-      <Architectures>x64;x86;arm;armel;arm64</Architectures>
+      <Architectures>x64;x86;arm;armel;arm64;s390x</Architectures>
     </RuntimeGroup>
 
     <RuntimeGroup Include="alpine">