From acc2e7fda628c091f32f5f4aed39aa08549cbb92 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 18 2021 17:14:39 +0000 Subject: import dotnet5.0-5.0.202-1.el8_4 --- diff --git a/.dotnet5.0.metadata b/.dotnet5.0.metadata index e753c8c..4c72127 100644 --- a/.dotnet5.0.metadata +++ b/.dotnet5.0.metadata @@ -1 +1 @@ -4c29720e364b8d4c2cf8809085da20141b849c17 SOURCES/dotnet-v5.0.104-SDK.tar.gz +1c965a7ecefcf4745de02ad9d17de1fefb5f2165 SOURCES/dotnet-v5.0.202-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 0639430..5b12c0e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v5.0.104-SDK.tar.gz +SOURCES/dotnet-v5.0.202-SDK.tar.gz diff --git a/SOURCES/sdk-telemetry-optout.patch b/SOURCES/sdk-telemetry-optout.patch index 9b92f33..d6e6464 100644 --- a/SOURCES/sdk-telemetry-optout.patch +++ b/SOURCES/sdk-telemetry-optout.patch @@ -15,4 +15,4 @@ index de1ebb9e6..6bbf479de 100644 + DebugHelper.HandleDebugSwitch(ref args); - new MulticoreJitActivator().TryActivateMulticoreJit(); + // Capture the current timestamp to calculate the host overhead. diff --git a/SPECS/dotnet5.0.spec b/SPECS/dotnet5.0.spec index 7ba9f84..dadf5ab 100644 --- a/SPECS/dotnet5.0.spec +++ b/SPECS/dotnet5.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 5.0.4 -%global runtime_version 5.0.4 +%global host_version 5.0.5 +%global runtime_version 5.0.5 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 5.0.104 +%global sdk_version 5.0.202 %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -56,7 +56,7 @@ Name: dotnet5.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/ @@ -86,9 +86,9 @@ ExclusiveArch: x86_64 BuildRequires: clang BuildRequires: cmake BuildRequires: coreutils -%if %{without bootstrap} -BuildRequires: dotnet-build-reference-packages BuildRequires: dotnet-sdk-5.0 +%if %{without bootstrap} +BuildRequires: dotnet5.0-build-reference-packages BuildRequires: dotnet-sdk-5.0-source-built-artifacts %endif BuildRequires: findutils @@ -319,10 +319,11 @@ find -iname '*.so' -type f -delete find -iname '*.tar.gz' -type f -delete find -iname '*.nupkg' -type f -delete find -iname '*.zip' -type f -delete -rm -rf .dotnet/ rm -rf packages/source-built %endif +rm -rf .dotnet/ + %if %{without bootstrap} sed -i -e 's|5.0.100-preview1-014459|5.0.103|' global.json mkdir -p packages/archive @@ -359,10 +360,10 @@ find -iname 'nuget.config' -exec echo {}: \; -exec cat {} \; -exec echo \; %build cat /etc/os-release -%if %{without bootstrap} +#%%if %%{without bootstrap} # We need to create a copy because we will mutate this cp -a %{_libdir}/dotnet previously-built-dotnet -%endif +#%%endif %if 0%{?fedora} > 32 || 0%{?rhel} > 8 # Setting this macro ensures that only clang supported options will be @@ -403,9 +404,7 @@ unset LDFLAGS #%%endif VERBOSE=1 ./build.sh \ -%if %{without bootstrap} --with-sdk previously-built-dotnet \ -%endif -- \ /v:n \ /p:SkipPortableRuntimeBuild=true \ @@ -528,6 +527,10 @@ echo "Testing build results for debug symbols..." %changelog +* Tue Apr 13 2021 Omair Majid - 5.0.202-1 +- Update to .NET SDK 5.0.202 and Runtime 5.0.5 +- Resolves: RHBZ#1947662 + * Tue Mar 09 2021 Omair Majid - 5.0.104-2 - Update to .NET SDK 5.0.104 and Runtime 5.0.4 - Resolves: RHBZ#1934241