From 0e238cdd7f7bffb41f1e7928a96e32f7d0c1f5c1 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 28 2022 08:48:41 +0000
Subject: import rh-dotnet60-dotnet-6.0.111-1.el7_9


---

diff --git a/.gitignore b/.gitignore
index 0e97296..f088f66 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v6.0.110.tar.gz
+SOURCES/dotnet-v6.0.111.tar.gz
diff --git a/.rh-dotnet60-dotnet.metadata b/.rh-dotnet60-dotnet.metadata
index d8935a1..53a5b69 100644
--- a/.rh-dotnet60-dotnet.metadata
+++ b/.rh-dotnet60-dotnet.metadata
@@ -1 +1 @@
-e25ecb15d957a57e1a95c1d72dea0b6dbff439cd SOURCES/dotnet-v6.0.110.tar.gz
+6d101226f34727847ae8c4aca74372114c14ffc0 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/dotnet.spec b/SPECS/dotnet.spec
index 8f0c1e7..29ba067 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -23,10 +23,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.10
-%global runtime_version 6.0.10
+%global host_version 6.0.11
+%global runtime_version 6.0.11
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.110
+%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 }')
@@ -100,8 +100,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
@@ -393,7 +391,6 @@ pushd src/sdk
 popd
 
 pushd src/installer
-%patch1600 -p1
 popd
 
 # Disable package validation which breaks our build, even though we
@@ -592,6 +589,10 @@ echo "Testing build results for debug symbols..."
 
 
 %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#2138274
+
 * Fri Sep 30 2022 Omair Majid <omajid@redhat.com> - 6.0.110-1
 - Update to .NET SDK 6.0.110 and Runtime 6.0.10
 - Resolves: RHBZ#2131324