From 94c29cc5e87edae5e6c5e5ec002c997b1a74bf30 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jul 15 2021 13:18:04 +0000
Subject: import rh-dotnet50-dotnet-5.0.205-1.el7_9


---

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/.rh-dotnet50-dotnet.metadata b/.rh-dotnet50-dotnet.metadata
index 6f8b80d..f2da14d 100644
--- a/.rh-dotnet50-dotnet.metadata
+++ b/.rh-dotnet50-dotnet.metadata
@@ -1 +1 @@
-c9109a516477f7905f0ae35d62a6aedd015932bc SOURCES/dotnet-v5.0.204-SDK.tar.gz
+7dcde611e8dcb950ae71de0470cd2e9e626574bc 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>$(DefineConstants);RESOURCES_EXTENSIONS</DefineConstants>
+      <Nullable>enable</Nullable>
+    </PropertyGroup>
+-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 @@
+- <Project Sdk="Microsoft.NET.Sdk">
+-   <PropertyGroup>
+--    <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461</TargetFrameworks>
+-+    <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461;net46</TargetFrameworks>
+-     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
+-   </PropertyGroup>
+-   <ItemGroup>
+-@@ -44,4 +44,4 @@
+-     </ItemGroup>
+-     <Exec Command="%(ExecuteMethod.Command)" WorkingDirectory="$(TargetDir)" />
+-   </Target>
+--</Project>
+-\ No newline at end of file
+-+</Project>
+--- 
+-2.18.0
+-
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index 7804abd..3944ac2 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 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 }')
@@ -72,6 +72,10 @@ Source1:        check-debug-symbols.py
 Source2:        dotnet.sh.in
 
 Patch1:         source-build-runtime-fixup-linker-order.patch
+# We remove the tests directory during building to save space
+# Unfortunately, some other patches in the build reference those tests
+# This removes those references
+Patch2:         source-build-remove-test-references-from-patches.patch
 
 # https://github.com/dotnet/runtime/pull/42094
 # Fix linker order when linking with --as-needed
@@ -322,6 +326,7 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-runtime.*/src/install
 sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
 
 %patch1 -p1
+%patch2 -p1
 
 pushd src/dotnet-runtime.*
 %patch100 -p1
@@ -524,6 +529,11 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Wed Jul 07 2021 Andrew Slice <aslice@redhat.com> - 5.0.205-1
+- Update to .NET SDK 5.0.205 and Runtime 5.0.8
+- Added a patch to remove references to the tests directory from other patches.
+- Resolves: RHBZ#1979991
+
 * Mon May 31 2021 Omair Majid <omajid@redhat.com> - 5.0.204-1
 - Update to .NET SDK 5.0.204 and Runtime 5.0.7
 - Resolves: RHBZ#1966163