From 5f1fb1f510efe2874afd4c36a149f3ec66457fb6 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 15 2023 09:18:51 +0000 Subject: import dotnet6.0-6.0.114-1.el8_7 --- diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata index fe42f18..0a16803 100644 --- a/.dotnet6.0.metadata +++ b/.dotnet6.0.metadata @@ -1 +1 @@ -5e90032a31524c51878aec17bce2a3988475052c SOURCES/dotnet-v6.0.113.tar.gz +c712d8d1134e0af3a2730228ada9b6fffb79a569 SOURCES/dotnet-v6.0.114.tar.gz 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/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 -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. - - - -- $(NETCoreSdkRuntimeIdentifier) -+ $(NETCoreSdkPortableRuntimeIdentifier) - - - diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec index 0d7261d..5583a52 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.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 }') @@ -111,8 +111,6 @@ Patch1001: msbuild-no-systemconfiguration.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 %if 0%{?fedora} || 0%{?rhel} >= 8 @@ -427,7 +425,6 @@ popd pushd src/sdk %patch1500 -p1 -%patch1501 -p1 popd pushd src/installer @@ -614,6 +611,10 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog +* Thu Feb 02 2023 Omair Majid - 6.0.114-1 +- Update to .NET SDK 6.0.114 and Runtime 6.0.14 +- Resolves: RHBZ#2166769 + * Mon Dec 19 2022 Omair Majid - 6.0.113-1 - Update to .NET SDK 6.0.113 and Runtime 6.0.13 - Resolves: RHBZ#2154458