From 61bb93df30e1300b88383e9bde3302ded09a88c1 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Fri, 11 Nov 2022 04:11:16 +0000
Subject: [PATCH] import dotnet6.0-6.0.111-1.el8_7

---
 .dotnet6.0.metadata                       |  2 +-
 .gitignore                                |  2 +-
 SOURCES/installer-12516-portablerid.patch | 23 -----------------------
 SPECS/dotnet6.0.spec                      | 15 ++++++++-------
 4 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 SOURCES/installer-12516-portablerid.patch

diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata
index bc4347a..7b1f775 100644
--- a/.dotnet6.0.metadata
+++ b/.dotnet6.0.metadata
@@ -1 +1 @@
-3e7e0c4fc4757c07747759196784dbdd3a49feaa SOURCES/dotnet-v6.0.109.tar.gz
+f0f38120a9d36b86ee9006f5282472901a3bf805 SOURCES/dotnet-v6.0.111.tar.gz
diff --git a/.gitignore b/.gitignore
index 8052bb8..f088f66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v6.0.109.tar.gz
+SOURCES/dotnet-v6.0.111.tar.gz
diff --git a/SOURCES/installer-12516-portablerid.patch b/SOURCES/installer-12516-portablerid.patch
deleted file mode 100644
index 4cb4ab6..0000000
--- a/SOURCES/installer-12516-portablerid.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 892222071f73062f969f4f6ed1df8f759b9327b7 Mon Sep 17 00:00:00 2001
-From: Tom Deseyn <tom.deseyn@gmail.com>
-Date: Wed, 3 Nov 2021 15:12:59 +0100
-Subject: [PATCH] GetRuntimeInformation.targets: determine
- PortableProductMonikerRid based on HostOSName and Architecture.
-
----
- src/redist/targets/GetRuntimeInformation.targets | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
-index 5133c3a3841..01f704c7d8e 100644
---- a/src/redist/targets/GetRuntimeInformation.targets
-+++ b/src/redist/targets/GetRuntimeInformation.targets
-@@ -28,6 +28,8 @@
-                                    '$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
-       <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>
- 
-+      <PortableProductMonikerRid Condition=" '$(PortableProductMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</PortableProductMonikerRid>
-+
-       <ArtifactNameSdk>dotnet-sdk-internal$(PgoTerm)</ArtifactNameSdk>
-       <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk$(PgoTerm)</ArtifactNameCombinedHostHostFxrFrameworkSdk>
- 
diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec
index e6799ac..afdd7c6 100644
--- a/SPECS/dotnet6.0.spec
+++ b/SPECS/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.9
-%global runtime_version 6.0.9
+%global host_version 6.0.11
+%global runtime_version 6.0.11
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.109
+%global sdk_version 6.0.111
 %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 }')
@@ -60,7 +60,7 @@
 
 Name:           dotnet6.0
 Version:        %{sdk_rpm_version}
-Release:        3%{?dist}
+Release:        1%{?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/
@@ -116,8 +116,6 @@ Patch1500:      sdk-telemetry-optout.patch
 # https://github.com/dotnet/sdk/pull/22373
 Patch1501:      sdk-22373-portablerid.patch
 
-# https://github.com/dotnet/installer/pull/12516
-Patch1600:      installer-12516-portablerid.patch
 
 %if 0%{?fedora} || 0%{?rhel} >= 8
 ExclusiveArch:  aarch64 x86_64 s390x
@@ -436,7 +434,6 @@ pushd src/sdk
 popd
 
 pushd src/installer
-%patch1600 -p1
 popd
 
 
@@ -620,6 +617,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
 
 
 %changelog
+* Wed Nov 02 2022 Omair Majid <omajid@redhat.com> - 6.0.111-1
+- Update to .NET SDK 6.0.111 and Runtime 6.0.11
+- Resolves: RHBZ#2138277
+
 * Sat Sep 17 2022 Omair Majid <omajid@redhat.com> - 6.0.109-3
 - Remove subpackages that are now provided by other packages
 - Related: RHBZ#2123787