diff --git a/.gitignore b/.gitignore index 6578a82..0f67fc4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v6.0.101-SDK.tar.gz +SOURCES/dotnet-v6.0.102-SDK.tar.gz diff --git a/.rh-dotnet60-dotnet.metadata b/.rh-dotnet60-dotnet.metadata index 8007dee..2ae79b6 100644 --- a/.rh-dotnet60-dotnet.metadata +++ b/.rh-dotnet60-dotnet.metadata @@ -1 +1 @@ -7d3d94b23e201a688cd492e9d42b3fd513a5d08a SOURCES/dotnet-v6.0.101-SDK.tar.gz +2720e6913372231c2c54703e279ef0bc65ac5920 SOURCES/dotnet-v6.0.102-SDK.tar.gz diff --git a/SOURCES/installer-12736-no-sudo.patch b/SOURCES/installer-12736-no-sudo.patch deleted file mode 100644 index 34d583a..0000000 --- a/SOURCES/installer-12736-no-sudo.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f8e115fadf6e8b392fa007e78d9b77fc64590cdd Mon Sep 17 00:00:00 2001 -From: Daniel Plaisted -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 diff --git a/SOURCES/sdk-23080-userlocal-workload.patch b/SOURCES/sdk-23080-userlocal-workload.patch deleted file mode 100644 index e874f20..0000000 --- a/SOURCES/sdk-23080-userlocal-workload.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 6e57b7c1d7f9b5ce82eef106d465af81382794b3 Mon Sep 17 00:00:00 2001 -From: Tom Deseyn -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)) diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec index 5afb7fd..03dc18c 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.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 }') @@ -63,7 +63,7 @@ Name: %{?scl_prefix}dotnet 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/ @@ -110,13 +110,9 @@ Patch900: roslyn-analyzers-no-apphost.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 @@ -416,12 +412,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 @@ -555,6 +549,8 @@ install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/ 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. @@ -618,6 +614,10 @@ echo "Testing build results for debug symbols..." %changelog +* Sun Jan 30 2022 Omair Majid - 6.0.102-1 +- Update to .NET SDK 6.0.102 and Runtime 6.0.2 +- Resolves: RHBZ#2048255 + * Thu Dec 16 2021 Omair Majid - 6.0.101-2 - Fix userlocal sdk installation - Related: RHBZ#2030381