From d6dfc3ff82e92fcea26dc2b66b85febe0943de3b Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Tue, 19 Jul 2022 10:37:37 -0400
Subject: [PATCH] Update to .NET SDK 6.0.107 and Runtime 6.0.7

---
 .gitignore                  |  1 +
 dotnet6.0.spec              | 14 +++----
 runtime-fedora-37-rid.patch | 84 -------------------------------------
 sources                     |  2 +-
 4 files changed, 9 insertions(+), 92 deletions(-)
 delete mode 100644 runtime-fedora-37-rid.patch

diff --git a/.gitignore b/.gitignore
index 0ab0b86..8235311 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /dotnet-v6.0.104.tar.gz
 /dotnet-v6.0.105.tar.gz
 /dotnet-v6.0.106.tar.gz
+/dotnet-v6.0.107.tar.gz
diff --git a/dotnet6.0.spec b/dotnet6.0.spec
index 97af6d5..0d942a7 100644
--- a/dotnet6.0.spec
+++ b/dotnet6.0.spec
@@ -20,10 +20,10 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}
 
-%global host_version 6.0.6
-%global runtime_version 6.0.6
+%global host_version 6.0.7
+%global runtime_version 6.0.7
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.106
+%global sdk_version 6.0.107
 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|')
 %global templates_version %{runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -86,10 +86,8 @@ Source11:       dotnet.sh.in
 Patch100:       runtime-arm64-lld-fix.patch
 # Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315
 Patch101:       runtime-mono-remove-ilstrip.patch
-# https://github.com/dotnet/runtime/pull/65392
-Patch102:       runtime-fedora-37-rid.patch
 # https://github.com/dotnet/runtime/pull/66594
-Patch103:       runtime-66594-s390x-debuginfo.patch
+Patch102:       runtime-66594-s390x-debuginfo.patch
 
 # https://github.com/dotnet/command-line-api/pull/1401
 Patch300:       command-line-api-use-work-tree-with-git-apply.patch
@@ -412,7 +410,6 @@ pushd src/runtime
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
-%patch103 -p1
 popd
 
 pushd src/command-line-api
@@ -665,6 +662,9 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Mon Jul 18 2022 Omair Majid <omajid@redhat.com> - 6.0.107-1
+- Update to .NET SDK 6.0.107 and Runtime 6.0.7
+
 * Wed Jun 15 2022 Omair Majid <omajid@redhat.com> - 6.0.106-1
 - Update to .NET SDK 6.0.106 and Runtime 6.0.6
 
diff --git a/runtime-fedora-37-rid.patch b/runtime-fedora-37-rid.patch
deleted file mode 100644
index 720fdcb..0000000
--- a/runtime-fedora-37-rid.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
-index bf6dfc3c1a1..1de4979b8ee 100644
---- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
-+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
-@@ -3029,6 +3029,38 @@
-     "any",
-     "base"
-   ],
-+  "fedora.37": [
-+    "fedora.37",
-+    "fedora",
-+    "linux",
-+    "unix",
-+    "any",
-+    "base"
-+  ],
-+  "fedora.37-arm64": [
-+    "fedora.37-arm64",
-+    "fedora.37",
-+    "fedora-arm64",
-+    "fedora",
-+    "linux-arm64",
-+    "linux",
-+    "unix-arm64",
-+    "unix",
-+    "any",
-+    "base"
-+  ],
-+  "fedora.37-x64": [
-+    "fedora.37-x64",
-+    "fedora.37",
-+    "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 2e6ec616b74..70a1582ba64 100644
---- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
-+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
-@@ -1146,6 +1146,23 @@
-         "fedora-x64"
-       ]
-     },
-+    "fedora.37": {
-+      "#import": [
-+        "fedora"
-+      ]
-+    },
-+    "fedora.37-arm64": {
-+      "#import": [
-+        "fedora.37",
-+        "fedora-arm64"
-+      ]
-+    },
-+    "fedora.37-x64": {
-+      "#import": [
-+        "fedora.37",
-+        "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 1945bb9af0e..75c6d28a30f 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</Versions>
-+      <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37</Versions>
-       <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
-     </RuntimeGroup>
- 
diff --git a/sources b/sources
index 24f806b..8037bd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dotnet-v6.0.106.tar.gz) = a069d75f94987a3e565d78e8e97f7a6cccbc6b2834c4543bdbc93e22a1c324159f8e2e661c410b22d7bba0ee766ca0d58ce7309d631aaa83736db6c3a44fb4c6
+SHA512 (dotnet-v6.0.107.tar.gz) = baf0a372adb168dd39c38628667a0afb688133bb666060a46f8db95cfe57a29a7bd5b3e088ce7511fd32f808ab82bc346ef232ded5cfa1a76052ba22e4d96be0