From 92b571d39aba09e28ec646b67f410e9cc7ad1e8e Mon Sep 17 00:00:00 2001
From: Eric Erhardt <eric.erhardt@microsoft.com>
Date: Wed, 28 Mar 2018 14:47:22 -0500
Subject: [PATCH] Support musl-libc based linux RIDs

- Add `musl-linux` RID
- Set `alpine`'s parent to `musl-linux`
- Add `alpine.3.7` to the graph
- Fix up `android` to inherit from `unix` while we are here

Fixes https://github.com/dotnet/core-setup/issues/3817
---
 .../runtime.compatibility.json                | 233 +++++++++++++++++-
 pkg/Microsoft.NETCore.Platforms/runtime.json  | 125 +++++++++-
 .../runtimeGroups.props                       |  12 +-
 3 files changed, 355 insertions(+), 15 deletions(-)

diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index a409a5751e7f..726fabc7d3e0 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -1,6 +1,7 @@
 {
   "alpine": [
     "alpine",
+    "musl-linux",
     "unix",
     "any",
     "base"
@@ -8,6 +9,8 @@
   "alpine-corert": [
     "alpine-corert",
     "alpine",
+    "musl-linux-corert",
+    "musl-linux",
     "unix-corert",
     "unix",
     "corert",
@@ -17,6 +20,8 @@
   "alpine-x64": [
     "alpine-x64",
     "alpine",
+    "musl-linux-x64",
+    "musl-linux",
     "unix-x64",
     "unix",
     "any",
@@ -26,8 +31,12 @@
     "alpine-x64-corert",
     "alpine-corert",
     "alpine-x64",
-    "unix-x64-corert",
+    "musl-linux-x64-corert",
     "alpine",
+    "musl-linux-corert",
+    "musl-linux-x64",
+    "unix-x64-corert",
+    "musl-linux",
     "unix-corert",
     "unix-x64",
     "unix",
@@ -38,6 +47,7 @@
   "alpine.3.6": [
     "alpine.3.6",
     "alpine",
+    "musl-linux",
     "unix",
     "any",
     "base"
@@ -47,6 +57,8 @@
     "alpine.3.6",
     "alpine-corert",
     "alpine",
+    "musl-linux-corert",
+    "musl-linux",
     "unix-corert",
     "unix",
     "corert",
@@ -58,6 +70,8 @@
     "alpine.3.6",
     "alpine-x64",
     "alpine",
+    "musl-linux-x64",
+    "musl-linux",
     "unix-x64",
     "unix",
     "any",
@@ -72,6 +86,73 @@
     "alpine-corert",
     "alpine-x64",
     "alpine",
+    "musl-linux-x64-corert",
+    "musl-linux-corert",
+    "musl-linux-x64",
+    "musl-linux",
+    "unix-x64-corert",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "alpine.3.7": [
+    "alpine.3.7",
+    "alpine.3.6",
+    "alpine",
+    "musl-linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine.3.7-corert": [
+    "alpine.3.7-corert",
+    "alpine.3.7",
+    "alpine.3.6-corert",
+    "alpine.3.6",
+    "alpine-corert",
+    "alpine",
+    "musl-linux-corert",
+    "musl-linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "alpine.3.7-x64": [
+    "alpine.3.7-x64",
+    "alpine.3.7",
+    "alpine.3.6-x64",
+    "alpine.3.6",
+    "alpine-x64",
+    "alpine",
+    "musl-linux-x64",
+    "musl-linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "alpine.3.7-x64-corert": [
+    "alpine.3.7-x64-corert",
+    "alpine.3.7-corert",
+    "alpine.3.7-x64",
+    "alpine.3.7",
+    "alpine.3.6-x64-corert",
+    "alpine.3.6-corert",
+    "alpine.3.6-x64",
+    "alpine.3.6",
+    "alpine-x64-corert",
+    "alpine-corert",
+    "alpine-x64",
+    "alpine",
+    "musl-linux-x64-corert",
+    "musl-linux-corert",
+    "musl-linux-x64",
+    "musl-linux",
     "unix-x64-corert",
     "unix-corert",
     "unix-x64",
@@ -82,12 +163,15 @@
   ],
   "android": [
     "android",
+    "unix",
     "any",
     "base"
   ],
   "android-arm": [
     "android-arm",
     "android",
+    "unix-arm",
+    "unix",
     "any",
     "base"
   ],
@@ -95,7 +179,11 @@
     "android-arm-corert",
     "android-corert",
     "android-arm",
+    "unix-arm-corert",
     "android",
+    "unix-corert",
+    "unix-arm",
+    "unix",
     "corert",
     "any",
     "base"
@@ -103,6 +191,8 @@
   "android-arm64": [
     "android-arm64",
     "android",
+    "unix-arm64",
+    "unix",
     "any",
     "base"
   ],
@@ -110,7 +200,11 @@
     "android-arm64-corert",
     "android-corert",
     "android-arm64",
+    "unix-arm64-corert",
     "android",
+    "unix-corert",
+    "unix-arm64",
+    "unix",
     "corert",
     "any",
     "base"
@@ -118,6 +212,8 @@
   "android-corert": [
     "android-corert",
     "android",
+    "unix-corert",
+    "unix",
     "corert",
     "any",
     "base"
@@ -125,6 +221,7 @@
   "android.21": [
     "android.21",
     "android",
+    "unix",
     "any",
     "base"
   ],
@@ -133,6 +230,8 @@
     "android.21",
     "android-arm",
     "android",
+    "unix-arm",
+    "unix",
     "any",
     "base"
   ],
@@ -145,6 +244,10 @@
     "android-corert",
     "android-arm",
     "android",
+    "unix-arm-corert",
+    "unix-corert",
+    "unix-arm",
+    "unix",
     "corert",
     "any",
     "base"
@@ -154,6 +257,8 @@
     "android.21",
     "android-arm64",
     "android",
+    "unix-arm64",
+    "unix",
     "any",
     "base"
   ],
@@ -166,6 +271,10 @@
     "android-corert",
     "android-arm64",
     "android",
+    "unix-arm64-corert",
+    "unix-corert",
+    "unix-arm64",
+    "unix",
     "corert",
     "any",
     "base"
@@ -175,6 +284,8 @@
     "android.21",
     "android-corert",
     "android",
+    "unix-corert",
+    "unix",
     "corert",
     "any",
     "base"
@@ -2136,6 +2247,126 @@
     "any",
     "base"
   ],
+  "musl-linux": [
+    "musl-linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "musl-linux-arm": [
+    "musl-linux-arm",
+    "musl-linux",
+    "unix-arm",
+    "unix",
+    "any",
+    "base"
+  ],
+  "musl-linux-arm-corert": [
+    "musl-linux-arm-corert",
+    "musl-linux-corert",
+    "musl-linux-arm",
+    "unix-arm-corert",
+    "musl-linux",
+    "unix-corert",
+    "unix-arm",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "musl-linux-arm64": [
+    "musl-linux-arm64",
+    "musl-linux",
+    "unix-arm64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "musl-linux-arm64-corert": [
+    "musl-linux-arm64-corert",
+    "musl-linux-corert",
+    "musl-linux-arm64",
+    "unix-arm64-corert",
+    "musl-linux",
+    "unix-corert",
+    "unix-arm64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "musl-linux-armel": [
+    "musl-linux-armel",
+    "musl-linux",
+    "unix-armel",
+    "unix",
+    "any",
+    "base"
+  ],
+  "musl-linux-armel-corert": [
+    "musl-linux-armel-corert",
+    "musl-linux-corert",
+    "musl-linux-armel",
+    "unix-armel-corert",
+    "musl-linux",
+    "unix-corert",
+    "unix-armel",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "musl-linux-corert": [
+    "musl-linux-corert",
+    "musl-linux",
+    "unix-corert",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "musl-linux-x64": [
+    "musl-linux-x64",
+    "musl-linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
+  "musl-linux-x64-corert": [
+    "musl-linux-x64-corert",
+    "musl-linux-corert",
+    "musl-linux-x64",
+    "unix-x64-corert",
+    "musl-linux",
+    "unix-corert",
+    "unix-x64",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
+  "musl-linux-x86": [
+    "musl-linux-x86",
+    "musl-linux",
+    "unix-x86",
+    "unix",
+    "any",
+    "base"
+  ],
+  "musl-linux-x86-corert": [
+    "musl-linux-x86-corert",
+    "musl-linux-corert",
+    "musl-linux-x86",
+    "unix-x86-corert",
+    "musl-linux",
+    "unix-corert",
+    "unix-x86",
+    "unix",
+    "corert",
+    "any",
+    "base"
+  ],
   "ol": [
     "ol",
     "rhel",
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
index 9165dd5f87b9..0fe308f63410 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -2,26 +2,26 @@
   "runtimes": {
     "alpine": {
       "#import": [
-        "unix"
+        "musl-linux"
       ]
     },
     "alpine-corert": {
       "#import": [
         "alpine",
-        "unix-corert"
+        "musl-linux-corert"
       ]
     },
     "alpine-x64": {
       "#import": [
         "alpine",
-        "unix-x64"
+        "musl-linux-x64"
       ]
     },
     "alpine-x64-corert": {
       "#import": [
         "alpine-corert",
         "alpine-x64",
-        "unix-x64-corert"
+        "musl-linux-x64-corert"
       ]
     },
     "alpine.3.6": {
@@ -49,37 +49,66 @@
         "alpine-x64-corert"
       ]
     },
+    "alpine.3.7": {
+      "#import": [
+        "alpine.3.6"
+      ]
+    },
+    "alpine.3.7-corert": {
+      "#import": [
+        "alpine.3.7",
+        "alpine.3.6-corert"
+      ]
+    },
+    "alpine.3.7-x64": {
+      "#import": [
+        "alpine.3.7",
+        "alpine.3.6-x64"
+      ]
+    },
+    "alpine.3.7-x64-corert": {
+      "#import": [
+        "alpine.3.7-corert",
+        "alpine.3.7-x64",
+        "alpine.3.7",
+        "alpine.3.6-x64-corert"
+      ]
+    },
     "android": {
       "#import": [
-        "any"
+        "unix"
       ]
     },
     "android-arm": {
       "#import": [
-        "android"
+        "android",
+        "unix-arm"
       ]
     },
     "android-arm-corert": {
       "#import": [
         "android-corert",
-        "android-arm"
+        "android-arm",
+        "unix-arm-corert"
       ]
     },
     "android-arm64": {
       "#import": [
-        "android"
+        "android",
+        "unix-arm64"
       ]
     },
     "android-arm64-corert": {
       "#import": [
         "android-corert",
-        "android-arm64"
+        "android-arm64",
+        "unix-arm64-corert"
       ]
     },
     "android-corert": {
       "#import": [
         "android",
-        "corert"
+        "unix-corert"
       ]
     },
     "android.21": {
@@ -925,6 +954,82 @@
         "ubuntu.18.04-x64-corert"
       ]
     },
+    "musl-linux": {
+      "#import": [
+        "unix"
+      ]
+    },
+    "musl-linux-arm": {
+      "#import": [
+        "musl-linux",
+        "unix-arm"
+      ]
+    },
+    "musl-linux-arm-corert": {
+      "#import": [
+        "musl-linux-corert",
+        "musl-linux-arm",
+        "unix-arm-corert"
+      ]
+    },
+    "musl-linux-arm64": {
+      "#import": [
+        "musl-linux",
+        "unix-arm64"
+      ]
+    },
+    "musl-linux-arm64-corert": {
+      "#import": [
+        "musl-linux-corert",
+        "musl-linux-arm64",
+        "unix-arm64-corert"
+      ]
+    },
+    "musl-linux-armel": {
+      "#import": [
+        "musl-linux",
+        "unix-armel"
+      ]
+    },
+    "musl-linux-armel-corert": {
+      "#import": [
+        "musl-linux-corert",
+        "musl-linux-armel",
+        "unix-armel-corert"
+      ]
+    },
+    "musl-linux-corert": {
+      "#import": [
+        "musl-linux",
+        "unix-corert"
+      ]
+    },
+    "musl-linux-x64": {
+      "#import": [
+        "musl-linux",
+        "unix-x64"
+      ]
+    },
+    "musl-linux-x64-corert": {
+      "#import": [
+        "musl-linux-corert",
+        "musl-linux-x64",
+        "unix-x64-corert"
+      ]
+    },
+    "musl-linux-x86": {
+      "#import": [
+        "musl-linux",
+        "unix-x86"
+      ]
+    },
+    "musl-linux-x86-corert": {
+      "#import": [
+        "musl-linux-corert",
+        "musl-linux-x86",
+        "unix-x86-corert"
+      ]
+    },
     "ol": {
       "#import": [
         "rhel"
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index 1255cbf1ff4b..f87fcbd0bee2 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -9,15 +9,19 @@
       <Parent>unix</Parent>
       <Architectures>x64;x86;arm;armel;arm64</Architectures>
     </RuntimeGroup>
+    <RuntimeGroup Include="musl-linux">
+      <Parent>unix</Parent>
+      <Architectures>x64;x86;arm;armel;arm64</Architectures>
+    </RuntimeGroup>
 
     <RuntimeGroup Include="alpine">
-      <Parent>unix</Parent>
+      <Parent>musl-linux</Parent>
       <Architectures>x64</Architectures>
-      <Versions>3.6</Versions>
+      <Versions>3.6;3.7</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="android">
-      <Parent>any</Parent>
+      <Parent>unix</Parent>
       <Architectures>arm;arm64</Architectures>
       <Versions>21</Versions>
     </RuntimeGroup>
@@ -163,4 +167,4 @@
                           RuntimeDirectedGraph="$(PackageReportDir)$(Id)$(NuspecSuffix)-runtime.json.dgml"
                           UpdateRuntimeFiles="$(UpdateRuntimeFiles)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>