Enable bootstrap and add Fedora 33 runtime ids

corefx-42871-fedora-33-rid.patch

@@ -0,0 +1,124 @@
+From 6cf4ff086875eaf29381cf406ea85846d9f66178 Mon Sep 17 00:00:00 2001
+From: Omair Majid <omajid@redhat.com>
+Date: Mon, 24 Feb 2020 14:11:03 -0500
+Subject: [PATCH] Add Fedora 33 runtime ids
+
+Fedora 32 is gearing up for release[1], and in-development version of
+Fedora has been offically labelled as being Fedora 33:
+
+    $ podman run -it fedora:33 cat /etc/os-release
+    NAME=Fedora
+    VERSION="33 (Container Image)"
+    ID=fedora
+    VERSION_ID=33
+    VERSION_CODENAME=""
+    PLATFORM_ID="platform:f33"
+    PRETTY_NAME="Fedora 33 (Container Image)"
+    ANSI_COLOR="0;34"
+    LOGO=fedora-logo-icon
+    CPE_NAME="cpe:/o:fedoraproject:fedora:33"
+    HOME_URL="https://fedoraproject.org/"
+    DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/rawhide/system-administrators-guide/"
+    SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help"
+    BUG_REPORT_URL="https://bugzilla.redhat.com/"
+    REDHAT_BUGZILLA_PRODUCT="Fedora"
+    REDHAT_BUGZILLA_PRODUCT_VERSION=rawhide
+    REDHAT_SUPPORT_PRODUCT="Fedora"
+    REDHAT_SUPPORT_PRODUCT_VERSION=rawhide
+    PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy"
+    VARIANT="Container Image"
+    VARIANT_ID=container
+
+[1] https://fedorapeople.org/groups/schedule/f-32/f-32-key-tasks.html
+---
+ eng/Packaging.props                           |  2 +-
+ .../runtime.compatibility.json                | 32 +++++++++++++++++++
+ pkg/Microsoft.NETCore.Platforms/runtime.json  | 17 ++++++++++
+ .../runtimeGroups.props                       |  2 +-
+ src/packages.builds                           |  3 ++
+ 5 files changed, 54 insertions(+), 2 deletions(-)
+
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+index 1e5c380a7a6a..c20e35394d6b 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
++++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+@@ -953,6 +953,38 @@
+     "any",
+     "base"
+   ],
++  "fedora.33": [
++    "fedora.33",
++    "fedora",
++    "linux",
++    "unix",
++    "any",
++    "base"
++  ],
++  "fedora.33-arm64": [
++    "fedora.33-arm64",
++    "fedora.33",
++    "fedora-arm64",
++    "fedora",
++    "linux-arm64",
++    "linux",
++    "unix-arm64",
++    "unix",
++    "any",
++    "base"
++  ],
++  "fedora.33-x64": [
++    "fedora.33-x64",
++    "fedora.33",
++    "fedora-x64",
++    "fedora",
++    "linux-x64",
++    "linux",
++    "unix-x64",
++    "unix",
++    "any",
++    "base"
++  ],
+   "freebsd": [
+     "freebsd",
+     "unix",
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
+index b2f286ea2479..b3380ecbbef3 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
++++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
+@@ -488,6 +488,23 @@
+         "fedora-x64"
+       ]
+     },
++    "fedora.33": {
++      "#import": [
++        "fedora"
++      ]
++    },
++    "fedora.33-arm64": {
++      "#import": [
++        "fedora.33",
++        "fedora-arm64"
++      ]
++    },
++    "fedora.33-x64": {
++      "#import": [
++        "fedora.33",
++        "fedora-x64"
++      ]
++    },
+     "freebsd": {
+       "#import": [
+         "unix"
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+index eeb8130b54fb..da48e5f9d09f 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
++++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+@@ -43,7 +43,7 @@
+     <RuntimeGroup Include="fedora">
+       <Parent>linux</Parent>
+       <Architectures>x64;arm64</Architectures>
+-      <Versions>23;24;25;26;27;28;29;30;31;32</Versions>
++      <Versions>23;24;25;26;27;28;29;30;31;32;33</Versions>
+       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+     </RuntimeGroup>
+ 

dotnet3.1.spec

@@ -1,4 +1,4 @@
-%bcond_with bootstrap
+%bcond_without bootstrap
 
 # Avoid provides/requires from private libraries
 %global privlibs             libhostfxr
@@ -56,7 +56,7 @@
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        .NET Core Runtime and SDK
 License:        MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:            https://github.com/dotnet/
@@ -67,6 +67,8 @@ Source0:        dotnet-v%{sdk_version}-SDK.tar.gz
 Source1:        check-debug-symbols.py
 Source2:        dotnet.sh.in
 
+Patch1:         sdk-rid.patch
+
 # Fix building with our additional CFLAGS/CXXFLAGS/LDFLAGS
 Patch100:       corefx-optflags-support.patch
 
@@ -76,6 +78,9 @@ Patch101:       corefx-39686-cgroupv2-01.patch
 Patch102:       corefx-39686-cgroupv2-02.patch
 Patch103:       corefx-39633-cgroupv2-mountpoints.patch
 
+# Add Fedora 33 RID to corefx
+Patch104:       corefx-42871-fedora-33-rid.patch
+
 # Build with with hardening flags, including -pie
 Patch200:       coreclr-hardening-flags.patch
 # Fix build with clang 10
@@ -346,6 +351,7 @@ pushd src/corefx.*
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 popd
 
 pushd src/coreclr.*
@@ -379,6 +385,7 @@ cat /etc/os-release
 
 %if %{without bootstrap}
 cp -a %{_libdir}/dotnet .dotnet
+patch -p0 -i %{PATCH1}
 %endif
 
 export CFLAGS="%{dotnet_cflags}"
@@ -499,6 +506,10 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Fri Feb 28 2020 Omair Majid <omajid@redhat.com> - 3.1.101-3
+- Enable bootstrap
+- Add Fedora 33 runtime ids
+
 * Thu Feb 27 2020 Omair Majid <omajid@redhat.com> - 3.1.101-2
 - Disable bootstrap
 

sdk-rid.patch

@@ -0,0 +1,33 @@
+--- .dotnet/sdk/3.1.101/RuntimeIdentifierGraph.json.orig	2020-02-27 19:48:57.286692828 -0500
++++ .dotnet/sdk/3.1.101/RuntimeIdentifierGraph.json	2020-02-27 19:49:17.185262594 -0500
+@@ -488,6 +488,23 @@
+         "fedora-x64"
+       ]
+     },
++    "fedora.33": {
++      "#import": [
++        "fedora"
++      ]
++    },
++    "fedora.33-arm64": {
++      "#import": [
++        "fedora.33",
++        "fedora-arm64"
++      ]
++    },
++    "fedora.33-x64": {
++      "#import": [
++        "fedora.33",
++        "fedora-x64"
++      ]
++    },
+     "freebsd": {
+       "#import": [
+         "unix"
+@@ -2042,4 +2059,4 @@
+       ]
+     }
+   }
+-}
+\ No newline at end of file
++}