From 69e3350ed4650a0d1380553cf1c629fa080e3194 Mon Sep 17 00:00:00 2001
From: Jeremy Barton <jbarton@microsoft.com>
Date: Thu, 13 Jun 2019 17:09:16 -0700
Subject: [PATCH] Define osx.10.15 RID (dotnet/corefx#38509)

Commit migrated from https://github.com/dotnet/corefx/commit/2458de0ada6a2eac4c36cc07628f4e7b3a02ad73
---
 .../runtime.compatibility.json                     | 32 ++++++++++++++++++++++
 .../pkg/Microsoft.NETCore.Platforms/runtime.json   | 11 ++++++++
 .../runtimeGroups.props                            |  2 +-
 3 files changed, 44 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 1d45d56..199bff8 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -1975,6 +1975,38 @@
     "any",
     "base"
   ],
+  "osx.10.15": [
+    "osx.10.15",
+    "osx.10.14",
+    "osx.10.13",
+    "osx.10.12",
+    "osx.10.11",
+    "osx.10.10",
+    "osx",
+    "unix",
+    "any",
+    "base"
+  ],
+  "osx.10.15-x64": [
+    "osx.10.15-x64",
+    "osx.10.15",
+    "osx.10.14-x64",
+    "osx.10.14",
+    "osx.10.13-x64",
+    "osx.10.13",
+    "osx.10.12-x64",
+    "osx.10.12",
+    "osx.10.11-x64",
+    "osx.10.11",
+    "osx.10.10-x64",
+    "osx.10.10",
+    "osx-x64",
+    "osx",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "rhel": [
     "rhel",
     "linux",
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
index af6347b..9beeadb 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -917,6 +917,17 @@
         "osx.10.13-x64"
       ]
     },
+    "osx.10.15": {
+      "#import": [
+        "osx.10.14"
+      ]
+    },
+    "osx.10.15-x64": {
+      "#import": [
+        "osx.10.15",
+        "osx.10.14-x64"
+      ]
+    },
     "rhel": {
       "#import": [
         "linux"
diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index 55299c2..d236809 100644
--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -92,7 +92,7 @@
     <RuntimeGroup Include="osx">
       <Parent>unix</Parent>
       <Architectures>x64</Architectures>
-      <Versions>10.10;10.11;10.12;10.13;10.14</Versions>
+      <Versions>10.10;10.11;10.12;10.13;10.14;10.15</Versions>
     </RuntimeGroup>
 
     <RuntimeGroup Include="freebsd">
-- 
2.7.4