diff --git a/.dotnet5.0.metadata b/.dotnet5.0.metadata index 8605702..ea1d6a1 100644 --- a/.dotnet5.0.metadata +++ b/.dotnet5.0.metadata @@ -1 +1 @@ -91830adf51334e34ee9b0c3c51526eb16a2fe8c7 SOURCES/dotnet-v5.0.204-SDK.tar.gz +49339772b2fd7192d80892693b960a9167e3dd46 SOURCES/dotnet-v5.0.205-SDK.tar.gz diff --git a/.gitignore b/.gitignore index 807c33f..107be80 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dotnet-v5.0.204-SDK.tar.gz +SOURCES/dotnet-v5.0.205-SDK.tar.gz diff --git a/SOURCES/source-build-remove-test-references-from-patches.patch b/SOURCES/source-build-remove-test-references-from-patches.patch new file mode 100644 index 0000000..ec4de9a --- /dev/null +++ b/SOURCES/source-build-remove-test-references-from-patches.patch @@ -0,0 +1,28 @@ +--- a/patches/runtime/0036-Add-net46-for-some-packages-to-support-Omnisharp.patch ++++ b/patches/runtime/0036-Add-net46-for-some-packages-to-support-Omnisharp.patch +@@ -58,25 +58,3 @@ + $(DefineConstants);RESOURCES_EXTENSIONS + enable + +-diff --git a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj +-index b48848c7a45..b310496f4bc 100644 +---- a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj +-+++ b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj +-@@ -1,6 +1,6 @@ +- +- +-- $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461 +-+ $(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461;net46 +- true +- +- +-@@ -44,4 +44,4 @@ +- +- +- +-- +-\ No newline at end of file +-+ +--- +-2.18.0 +- diff --git a/SPECS/dotnet5.0.spec b/SPECS/dotnet5.0.spec index 6ba4eb4..0092609 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.7 -%global runtime_version 5.0.7 +%global host_version 5.0.8 +%global runtime_version 5.0.8 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 5.0.204 +%global sdk_version 5.0.205 %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -67,6 +67,8 @@ Source0: dotnet-v%{src_version}-SDK.tar.gz Source1: check-debug-symbols.py Source2: dotnet.sh.in +Patch1: source-build-remove-test-references-from-patches.patch + # Disable telemetry by default; make it opt-in Patch500: sdk-telemetry-optout.patch @@ -329,6 +331,8 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/installer/core # Disable warnings sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props +%patch1 -p1 + pushd src/runtime.* popd @@ -518,6 +522,10 @@ echo "Testing build results for debug symbols..." %changelog +* Tue Aug 10 2021 Omair Majid - 5.0.205-1 +- Update to .NET SDK 5.0.205 and Runtime 5.0.8 +- Resolves: RHBZ#1985445 + * Fri Jun 11 2021 Omair Majid - 5.0.204-1 - Update to .NET SDK 5.0.204 and Runtime 5.0.7 - Resolves: RHBZ#1966164