Fedora 30 patches for preview4

0001-Add-fedora.30-RID.patch

From 91289ff42ee2c9569820ceb4a6324ec27c550c95 Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Mon, 20 May 2019 18:41:52 -0700
Subject: [PATCH] Add fedora.30 RID.

---
 .../runtime.compatibility.json                | 22 ++++++++++++++++++-
 pkg/Microsoft.NETCore.Platforms/runtime.json  | 13 ++++++++++-
 .../runtimeGroups.props                       |  2 +-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index 64512cb82d..b507f6d452 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -596,6 +596,26 @@
     "any",
     "base"
   ],
+  "fedora.30": [
+    "fedora.30",
+    "fedora",
+    "linux",
+    "unix",
+    "any",
+    "base"
+  ],
+  "fedora.30-x64": [
+    "fedora.30-x64",
+    "fedora.30",
+    "fedora-x64",
+    "fedora",
+    "linux-x64",
+    "linux",
+    "unix-x64",
+    "unix",
+    "any",
+    "base"
+  ],
   "freebsd": [
     "freebsd",
     "unix",
@@ -3610,4 +3630,4 @@
     "any",
     "base"
   ]
-}
\ No newline at end of file
+}
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
index f9ee87f9fe..6ad3ccf451 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -319,6 +319,17 @@
         "fedora-x64"
       ]
     },
+    "fedora.30": {
+      "#import": [
+        "fedora"
+      ]
+    },
+    "fedora.30-x64": {
+      "#import": [
+        "fedora.30",
+        "fedora-x64"
+      ]
+    },
     "freebsd": {
       "#import": [
         "unix"
@@ -1699,4 +1710,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index a819d57ddc..6f24e66877 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -42,7 +42,7 @@
     <RuntimeGroup Include="fedora">
       <Parent>linux</Parent>
       <Architectures>x64</Architectures>
-      <Versions>23;24;25;26;27;28;29</Versions>
+      <Versions>23;24;25;26;27;28;29;30</Versions>
       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
     </RuntimeGroup>

--
2.21.0

0001-Change-CoreFX-RuntimeOS-because-bootstrap-Fedora.30-.patch

From 242adfb4ba22257ed7d4fa3a6bd3057ce2b7609e Mon Sep 17 00:00:00 2001
From: Chris Rummel <[email protected]>
Date: Wed, 22 May 2019 18:23:40 -0700
Subject: [PATCH] Change CoreFX RuntimeOS because bootstrap Fedora.30 packages
 do not exist yet.

---
 repos/corefx.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repos/corefx.proj b/repos/corefx.proj
index e6a497a..fee6ada 100644
--- a/repos/corefx.proj
+++ b/repos/corefx.proj
@@ -16,8 +16,8 @@
     <BuildArguments>$(BuildArguments) /p:SkipTests=true</BuildArguments>
     <BuildArguments>$(BuildArguments) /p:ArchGroup=$(Platform)</BuildArguments>
     <BuildArguments>$(BuildArguments) /p:ConfigurationGroup=$(Configuration)</BuildArguments>
-    <BuildArguments>$(BuildArguments) /p:PackageRid=$(OverrideTargetRid)</BuildArguments>
-    <BuildArguments>$(BuildArguments) /p:RuntimeOS=$(OverrideTargetRid.Substring(0, $(OverrideTargetRid.IndexOf("-"))))</BuildArguments>
+    <BuildArguments>$(BuildArguments) /p:PackageRid=linux-x64</BuildArguments>
+    <BuildArguments>$(BuildArguments) /p:RuntimeOS=linux</BuildArguments>
     <BuildArguments>$(BuildArguments) /p:PortableBuild=$(OverridePortableBuild)</BuildArguments>
     <BuildArguments>$(BuildArguments) /p:ToolsDir=$(ToolsDir)</BuildArguments>
     <BuildArguments>$(BuildArguments) /p:EnableSourceLink=false</BuildArguments>
--
2.21.0