From 97369eb336c83e9a2195794bb056bb15029ccf76 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 15 2023 08:50:22 +0000
Subject: import rh-dotnet60-dotnet-6.0.114-1.el7_9


---

diff --git a/.gitignore b/.gitignore
index af1d5f3..8260a5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v6.0.113.tar.gz
+SOURCES/dotnet-v6.0.114.tar.gz
diff --git a/.rh-dotnet60-dotnet.metadata b/.rh-dotnet60-dotnet.metadata
index 48d9560..d29437a 100644
--- a/.rh-dotnet60-dotnet.metadata
+++ b/.rh-dotnet60-dotnet.metadata
@@ -1 +1 @@
-7ee55f251bd1efc4616eb8f2c9828f9d98442ed0 SOURCES/dotnet-v6.0.113.tar.gz
+b88b8ae440e723edc008e9370f7b38c89241b306 SOURCES/dotnet-v6.0.114.tar.gz
diff --git a/SOURCES/sdk-22373-portablerid.patch b/SOURCES/sdk-22373-portablerid.patch
deleted file mode 100644
index 8b39eb3..0000000
--- a/SOURCES/sdk-22373-portablerid.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 499fcf6e3b0e4b01a9c340a06f00cfc3e1fcc5d2 Mon Sep 17 00:00:00 2001
-From: Tom Deseyn <tom.deseyn@gmail.com>
-Date: Tue, 5 Oct 2021 09:04:14 +0200
-Subject: [PATCH] Use the portable rid for --use-current-runtime.
-
----
- .../targets/Microsoft.NET.RuntimeIdentifierInference.targets    | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
-index 17308aa9160..e764b2d9845 100644
---- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
-+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets
-@@ -62,7 +62,7 @@ Copyright (c) .NET Foundation. All rights reserved.
-   </PropertyGroup>
- 
-   <PropertyGroup Condition="'$(UseCurrentRuntimeIdentifier)' == 'true'">
--    <RuntimeIdentifier>$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
-+    <RuntimeIdentifier>$(NETCoreSdkPortableRuntimeIdentifier)</RuntimeIdentifier>
-   </PropertyGroup>
- 
-   <PropertyGroup Condition="'$(PlatformTarget)' == ''">
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index a98a7eb..c88b58f 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.13
-%global runtime_version 6.0.13
+%global host_version 6.0.14
+%global runtime_version 6.0.14
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.113
+%global sdk_version 6.0.114
 %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 }')
@@ -97,8 +97,6 @@ Patch900:       roslyn-analyzers-no-apphost.patch
 
 # Disable telemetry by default; make it opt-in
 Patch1500:      sdk-telemetry-optout.patch
-# https://github.com/dotnet/sdk/pull/22373
-Patch1501:      sdk-22373-portablerid.patch
 
 
 
@@ -387,7 +385,6 @@ popd
 
 pushd src/sdk
 %patch1500 -p1
-%patch1501 -p1
 popd
 
 pushd src/installer
@@ -589,6 +586,10 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Thu Feb 02 2023 Omair Majid <omajid@redhat.com> - 6.0.114-1
+- Update to .NET SDK 6.0.114 and Runtime 6.0.14
+- Resolves: RHBZ#2166764
+
 * Mon Dec 19 2022 Omair Majid <omajid@redhat.com> - 6.0.113-1
 - Update to .NET SDK 6.0.113 and Runtime 6.0.13
 - Resolves: RHBZ#2154455