import dotnet6.0-6.0.102-1.el8_5

.dotnet6.0.metadata

@@ -1 +1 @@
-0d1ecdbbe7ebfd2fc201854d02d98212a3fcaed3 SOURCES/dotnet-v6.0.101-SDK.tar.gz
+f2c1dc7dad1af4b9f6f48b507cad4042446af0a0 SOURCES/dotnet-v6.0.102-SDK.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/dotnet-v6.0.101-SDK.tar.gz
+SOURCES/dotnet-v6.0.102-SDK.tar.gz

SOURCES/installer-12736-no-sudo.patch

@@ -1,39 +0,0 @@
-From f8e115fadf6e8b392fa007e78d9b77fc64590cdd Mon Sep 17 00:00:00 2001
-From: Daniel Plaisted <dsplaisted@gmail.com>
-Date: Mon, 29 Nov 2021 20:19:30 -0800
-Subject: [PATCH] Don't set ulimit
-
-1ES pools should now have ulimit set already now
----
- build.sh     | 4 +---
- run-build.sh | 4 ----
- 2 files changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/build.sh b/build.sh
-index 594a355fafa..7ff647c4060 100755
---- a/build.sh
-+++ b/build.sh
-@@ -53,7 +53,5 @@ dockerbuild()
- if [ ! -z "$BUILD_IN_DOCKER" ]; then
-     dockerbuild $args
- else
--    # Run under sudo so we can set ulimit
--    # See https://github.com/dotnet/core-eng/issues/14808
--    sudo -E $DIR/run-build.sh $args
-+    $DIR/run-build.sh $args
- fi
-diff --git a/run-build.sh b/run-build.sh
-index fe839eb8009..7b98aedc0be 100755
---- a/run-build.sh
-+++ b/run-build.sh
-@@ -25,10 +25,6 @@ CUSTOM_BUILD_ARGS=
- # Set nuget package cache under the repo
- [ -z $NUGET_PACKAGES ] && export NUGET_PACKAGES="$REPOROOT/.nuget/packages"
- 
--# Set max number of files open, helps avoid errors during NuGet restore
--# See https://github.com/dotnet/core-eng/issues/14808
--ulimit -n 16384
--
- args=( )
- 
- while [[ $# > 0 ]]; do

SOURCES/sdk-23080-userlocal-workload.patch

@@ -1,23 +0,0 @@
-From 6e57b7c1d7f9b5ce82eef106d465af81382794b3 Mon Sep 17 00:00:00 2001
-From: Tom Deseyn <tom.deseyn@gmail.com>
-Date: Wed, 15 Dec 2021 15:06:51 +0100
-Subject: [PATCH] userlocal detection: also force last digits to zero for
- non-preview versions.
-
----
- src/Common/WorkloadFileBasedInstall.cs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Common/WorkloadFileBasedInstall.cs b/src/Common/WorkloadFileBasedInstall.cs
-index f0d82c1fa9..0b27b0939c 100644
---- a/src/Common/WorkloadFileBasedInstall.cs
-+++ b/src/Common/WorkloadFileBasedInstall.cs
-@@ -21,7 +21,7 @@ internal static void SetUserLocal(string dotnetDir, string sdkFeatureBand)
- 
-         private static string GetUserInstallFilePath(string dotnetDir, string sdkFeatureBand)
-         {
--            if (sdkFeatureBand.Contains("-"))
-+            if (sdkFeatureBand.Contains("-") || !sdkFeatureBand.EndsWith("00", StringComparison.Ordinal))
-             {
-                 // The user passed in the sdk version. Derive the feature band version.
-                 if (!Version.TryParse(sdkFeatureBand.Split('-')[0], out var sdkVersionParsed))

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.1
-%global runtime_version 6.0.1
+%global host_version 6.0.2
+%global runtime_version 6.0.2
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.101
+%global sdk_version 6.0.102
 %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:        2%{?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/
@@ -124,13 +124,9 @@ Patch1001:      msbuild-no-systemconfiguration.patch
 Patch1500:      sdk-telemetry-optout.patch
 # https://github.com/dotnet/sdk/pull/22373
 Patch1501:      sdk-22373-portablerid.patch
-# https://github.com/dotnet/sdk/pull/23080
-Patch1502:      sdk-23080-userlocal-workload.patch
 
 # https://github.com/dotnet/installer/pull/12516
 Patch1600:      installer-12516-portablerid.patch
-# https://github.com/dotnet/installer/pull/12736
-Patch1601:      installer-12736-no-sudo.patch
 
 
 %if 0%{?fedora} || 0%{?rhel} >= 8
@@ -460,12 +456,10 @@ popd
 pushd src/sdk.*
 %patch1500 -p1
 %patch1501 -p1
-%patch1502 -p1
 popd
 
 pushd src/installer.*
 %patch1600 -p1
-%patch1601 -p1
 popd
 
 # Disable package validation which breaks our build, even though we
@@ -591,12 +585,14 @@ install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts
 install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/
 
 
+# Quick and dirty check for https://github.com/dotnet/source-build/issues/2731
+test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/Sdk/Sdk.props
+
 # Check debug symbols in all elf objects. This is not in %%check
 # because native binaries are stripped by rpm-build after %%install.
 # So we need to do this check earlier.
-# FIXME
-#echo "Testing build results for debug symbols..."
-#%%{SOURCE10} -v %%{buildroot}%%{_libdir}/dotnet/
+echo "Testing build results for debug symbols..."
+%{SOURCE10} -v %{buildroot}%{_libdir}/dotnet/
 
 
 
@@ -655,6 +651,10 @@ install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.
 
 
 %changelog
+* Mon Jan 31 2022 Omair Majid <omajid@redhat.com> - 6.0.102-1
+- Update to .NET SDK 6.0.102 and Runtime 6.0.2
+- Resolves: RHBZ#2048257
+
 * Wed Dec 15 2021 Omair Majid <omajid@redhat.com> - 6.0.101-1
 - Fix userlocal workload install
 - Related: RHBZ#2030391