From 1e9de4a3a41823408401fd16140dace744c8f66a Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Mon, 22 Aug 2022 22:20:25 -0400
Subject: [PATCH] Add an RID for Fedora 38

---
 dotnet6.0.spec              |   8 ++-
 runtime-fedora-38-rid.patch | 138 ++++++++++++++++++++++++++++++++++++
 2 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 runtime-fedora-38-rid.patch

diff --git a/dotnet6.0.spec b/dotnet6.0.spec
index 4fb459d..708e261 100644
--- a/dotnet6.0.spec
+++ b/dotnet6.0.spec
@@ -60,7 +60,7 @@
 
 Name:           dotnet6.0
 Version:        %{sdk_rpm_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        .NET 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/
@@ -88,6 +88,8 @@ Patch100:       runtime-arm64-lld-fix.patch
 Patch101:       runtime-mono-remove-ilstrip.patch
 # https://github.com/dotnet/runtime/pull/66594
 Patch102:       runtime-66594-s390x-debuginfo.patch
+# https://github.com/dotnet/runtime/pull/74383
+Patch103:       runtime-fedora-38-rid.patch
 
 # Disable apphost, needed for s390x
 Patch500:       fsharp-no-apphost.patch
@@ -399,6 +401,7 @@ pushd src/runtime
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
+%patch103 -p1
 popd
 
 pushd src/fsharp
@@ -638,6 +641,9 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Mon Aug 22 2022 Omair Majid <omajid@redhat.com> - 6.0.108-2
+- Add an RID for Fedora 38
+
 * Tue Aug 09 2022 Omair Majid <omajid@redhat.com> - 6.0.108-1
 - Update to .NET SDK 6.0.108 and Runtime 6.0.8
 
diff --git a/runtime-fedora-38-rid.patch b/runtime-fedora-38-rid.patch
new file mode 100644
index 0000000..dcf75e3
--- /dev/null
+++ b/runtime-fedora-38-rid.patch
@@ -0,0 +1,138 @@
+From d5aa0f0e93448a9defc901e98a70b00e26359d46 Mon Sep 17 00:00:00 2001
+From: Omair Majid <omajid@redhat.com>
+Date: Mon, 22 Aug 2022 11:48:00 -0400
+Subject: [PATCH] Add Fedora 38 RID
+
+Fedora 38 is now in development:
+
+    $ podman run -it registry.fedoraproject.org/fedora:rawhide
+    [root@d3934d2b267b /]# cat /etc/os-release
+    NAME="Fedora Linux"
+    VERSION="38 (Container Image Prerelease)"
+    ID=fedora
+    VERSION_ID=38
+    VERSION_CODENAME=""
+    PLATFORM_ID="platform:f38"
+    PRETTY_NAME="Fedora Linux 38 (Container Image Prerelease)"
+    ANSI_COLOR="0;38;2;60;110;180"
+    LOGO=fedora-logo-icon
+    CPE_NAME="cpe:/o:fedoraproject:fedora:38"
+    DEFAULT_HOSTNAME="fedora"
+    HOME_URL="https://fedoraproject.org/"
+    DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/rawhide/system-administrators-guide/"
+    SUPPORT_URL="https://ask.fedoraproject.org/"
+    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
+    VARIANT="Container Image"
+    VARIANT_ID=container
+---
+ .../src/Microsoft.NETCore.Platforms.csproj    |  3 +-
+ .../src/runtime.compatibility.json            | 32 +++++++++++++++++++
+ .../src/runtime.json                          | 17 ++++++++++
+ .../src/runtimeGroups.props                   |  2 +-
+ 4 files changed, 52 insertions(+), 2 deletions(-)
+
+diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+index e324ea113d2..262b0aae1a8 100644
+--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
++++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
+@@ -19,7 +19,8 @@
+ 
+     <!-- When building from source, ensure the RID we're building for is part of the RID graph -->
+     <AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
+-    <ServicingVersion>5</ServicingVersion>
++    <ServicingVersion>6</ServicingVersion>
++    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+   </PropertyGroup>
+ 
+   <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+index f4aebcb7147..dce6a7f5346 100644
+--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
++++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
+@@ -3182,6 +3182,38 @@
+     "any",
+     "base"
+   ],
++  "fedora.38": [
++    "fedora.38",
++    "fedora",
++    "linux",
++    "unix",
++    "any",
++    "base"
++  ],
++  "fedora.38-arm64": [
++    "fedora.38-arm64",
++    "fedora.38",
++    "fedora-arm64",
++    "fedora",
++    "linux-arm64",
++    "linux",
++    "unix-arm64",
++    "unix",
++    "any",
++    "base"
++  ],
++  "fedora.38-x64": [
++    "fedora.38-x64",
++    "fedora.38",
++    "fedora-x64",
++    "fedora",
++    "linux-x64",
++    "linux",
++    "unix-x64",
++    "unix",
++    "any",
++    "base"
++  ],
+   "freebsd": [
+     "freebsd",
+     "unix",
+diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+index fb2ea2da7c0..a7867d81727 100644
+--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
++++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
+@@ -1186,6 +1186,23 @@
+         "fedora-x64"
+       ]
+     },
++    "fedora.38": {
++      "#import": [
++        "fedora"
++      ]
++    },
++    "fedora.38-arm64": {
++      "#import": [
++        "fedora.38",
++        "fedora-arm64"
++      ]
++    },
++    "fedora.38-x64": {
++      "#import": [
++        "fedora.38",
++        "fedora-x64"
++      ]
++    },
+     "freebsd": {
+       "#import": [
+         "unix"
+diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+index 479e1397e7a..ce8cc1d22b7 100644
+--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
++++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
+@@ -71,7 +71,7 @@
+     <RuntimeGroup Include="fedora">
+       <Parent>linux</Parent>
+       <Architectures>x64;arm64</Architectures>
+-      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37</Versions>
++      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38</Versions>
+       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+     </RuntimeGroup>
+ 
+-- 
+2.37.2
+