From adde01dba43349128dbc6b5bf73e156940f2259e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 15 Jul 2021 09:14:29 -0400
Subject: [PATCH] import dotnet5.0-5.0.205-1.el8_4

---
 .dotnet5.0.metadata                           |  2 +-
 .gitignore                                    |  2 +-
 ...-remove-test-references-from-patches.patch | 28 +++++++++++++++++++
 SPECS/dotnet5.0.spec                          | 13 +++++++--
 4 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 SOURCES/source-build-remove-test-references-from-patches.patch

diff --git a/.dotnet5.0.metadata b/.dotnet5.0.metadata
index 06aae19..a48118e 100644
--- a/.dotnet5.0.metadata
+++ b/.dotnet5.0.metadata
@@ -1 +1 @@
-ff7868c64b73af945d0d6d53b482f41b26886850 SOURCES/dotnet-v5.0.204-SDK.tar.gz
+67aeddf92407bc57d9b3398274b2cfe340446e04 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>$(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/dotnet5.0.spec b/SPECS/dotnet5.0.spec
index 415ea6c..a9ba37a 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 }')
 
@@ -68,6 +68,7 @@ Source1:        check-debug-symbols.py
 Source2:        dotnet.sh.in
 
 Patch1:         source-build-runtime-fixup-linker-order.patch
+Patch2:         source-build-remove-test-references-from-patches.patch
 
 # https://github.com/dotnet/runtime/pull/42094
 # Fix linker order when linking with --as-needed
@@ -338,6 +339,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
@@ -527,6 +529,11 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Thu Jul 08 2021 Andrew Slice <andrew.slice@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#1980412
+
 * 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#1966166