From 0511ae5f2c1fab12b35e78b22b3ecbfb63185bfa Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Sep 08 2020 17:55:17 +0000
Subject: import rh-dotnet31-dotnet-3.1.108-1.el7


---

diff --git a/.gitignore b/.gitignore
index 30715b7..dc54aca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v3.1.107-SDK.tar.gz
+SOURCES/dotnet-v3.1.108-SDK.tar.gz
diff --git a/.rh-dotnet31-dotnet.metadata b/.rh-dotnet31-dotnet.metadata
index 0d20fab..b96c9df 100644
--- a/.rh-dotnet31-dotnet.metadata
+++ b/.rh-dotnet31-dotnet.metadata
@@ -1 +1 @@
-0a5ce43f92313ac69254648c147bdc66da9aba42 SOURCES/dotnet-v3.1.107-SDK.tar.gz
+2056a426a964052d932ac9d69648facaeebb60bb SOURCES/dotnet-v3.1.108-SDK.tar.gz
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index 81bb23b..51a2fc7 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -26,10 +26,10 @@
 %endif
 %global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
 
-%global host_version 3.1.7
-%global runtime_version 3.1.7
+%global host_version 3.1.8
+%global runtime_version 3.1.8
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.107
+%global sdk_version 3.1.108
 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
 
 %global host_rpm_version %{host_version}
@@ -273,7 +273,7 @@ applications using the .NET Core SDK.
 %setup -q -n dotnet-v%{sdk_version}-SDK
 
 # Fix bad hardcoded path in build
-sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp
+sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp
 
 # Disable warnings
 sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
@@ -281,7 +281,7 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.proj
 # This patch was added when building the tarball; we use a better version
 rm -f patches/corefx/build-corefx-werror.patch
 
-pushd src/dotnet-corefx.*
+pushd src/corefx.*
 %patch100 -p1
 popd
 
@@ -289,12 +289,12 @@ pushd src/coreclr.*
 %patch200 -p1
 popd
 
-pushd src/dotnet-core-setup.*
+pushd src/core-setup.*
 %patch300 -p1
 %patch301 -p1
 popd
 
-pushd src/dotnet-cli.*
+pushd src/cli.*
 %patch500 -p1
 popd
 
@@ -358,31 +358,25 @@ chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/
 chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/FrameworkList.xml
 chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/data/PlatformManifest.txt
 chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/ref/netcoreapp3.1/*.xml
-chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/data/PackageOverrides.txt
-chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/data/FrameworkList.xml
-chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/data/PlatformManifest.txt
-chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.3/ref/netcoreapp3.1/*.xml
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.8/ref/netcoreapp3.1/*.xml
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.8/data/PackageOverrides.txt
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.8/data/FrameworkList.xml
+chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.AspNetCore.App.Ref/3.1.8/data/PlatformManifest.txt
 chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/PackageOverrides.txt
 chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/data/FrameworkList.xml
 chmod 0644 %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/ref/netstandard2.1/netstandard.xml
 
-# See https://github.com/dotnet/source-build-reference-packages/pull/121
-rm -r %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/obj
-rm -r %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Ref/3.1.0/microsoft.netcore.app.ref
-rm -r %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/netstandard.library.ref
-rm -r %{buildroot}/%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0/obj
-
 # Add ~/.dotnet/tools to $PATH for all users
 install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/
 install %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/
 
 install -dm 0755 %{buildroot}/%{_root_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
-install src/dotnet-cli.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet
+install src/cli.*/scripts/register-completions.bash %{buildroot}/%{_root_datadir}/bash-completion/completions/dotnet
 
 # TODO: the zsh completion script needs to be ported to use #compdef
 #install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
-#install src/dotnet-cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
+#install src/cli/scripts/register-completions.zsh %%{buildroot}/%%{_datadir}/zsh/site-functions/_dotnet
 
 install -dm 0755 %{buildroot}%{_bindir}
 ln -s ../../../../../../%{_libdir}/dotnet/dotnet %{buildroot}%{_bindir}/
@@ -447,6 +441,10 @@ echo "Testing build results for debug symbols..."
 %dir %{_libdir}/dotnet/packs
 
 %changelog
+* Tue Sep 01 2020 Omair Majid <omajid@redhat.com> - 3.1.108-1
+- Update to .NET Core SDK 3.1.108 and Runtime 3.1.8
+- Resolves: RHBZ#1874502
+
 * Mon Aug 03 2020 Omair Majid <omajid@redhat.com> - 3.1.107-1
 - Update to .NET Core SDK 3.1.107 and Runtime 3.1.7
 - Resolves: RHBZ#1862589