Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/dotnet3.1.git#59047916b8e8fffc5579af2187a68c0ec362fb34

.gitignore

@@ -10,3 +10,4 @@
 /dotnet-v3.1.108-SDK.tar.gz
 /dotnet-v3.1.109-SDK.tar.gz
 /dotnet-v3.1.110-SDK.tar.gz
+/dotnet-v3.1.111-SDK.tar.gz

build-dotnet-tarball

@@ -93,11 +93,12 @@ if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then
     clean_dotnet_cache
     sed -i -e 's|cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE||' repos/coreclr.proj
     mkdir -p patches/coreclr/
-    cp ../../build-coreclr-clang10.patch patches/coreclr
+    cp ../../build-coreclr-clang10.patch patches/coreclr/
+    cp ../../coreclr-libunwind-fno-common.patch patches/coreclr/
     mkdir -p patches/corefx/
-    cp ../../corefx-42900-clang-10.patch patches/corefx
+    cp ../../corefx-42900-clang-10.patch patches/corefx/
     mkdir -p patches/aspnetcore/
-    cp ../../disable-aspnetcore-targetingpackoverride.patch patches/aspnetcore
+    cp ../../disable-aspnetcore-targetingpackoverride.patch patches/aspnetcore/
     ./build.sh /p:ArchiveDownloadedPackages=true  /p:DownloadSourceBuildReferencePackagesTimeoutSeconds=100000 /p:DownloadSourceBuildReferencePackagesTimeoutSeconds=100000
     ./build-source-tarball.sh "${unmodified_tarball_name}" --skip-build
     popd

core-setup-gcc11.patch

@@ -0,0 +1,19 @@
+diff --git a/src/corehost/cli/test/nativehost/host_context_test.cpp b/src/corehost/cli/test/nativehost/host_context_test.cpp
+index e6dc9f6d8..d42c0e0f2 100644
+--- a/src/corehost/cli/test/nativehost/host_context_test.cpp
++++ b/src/corehost/cli/test/nativehost/host_context_test.cpp
+@@ -11,6 +11,7 @@
+ #include <corehost_context_contract.h>
+ #include "host_context_test.h"
+ #include <utils.h>
++#include <thread>
+ 
+ namespace
+ {
+@@ -539,4 +540,4 @@ bool host_context_test::load_assembly_and_get_function_pointer(
+     hostfxr_exports hostfxr{ hostfxr_path };
+ 
+     return load_assembly_and_get_function_pointer(hostfxr, config_path, argc, argv, config_log_prefix, test_output);
+-}
+\ No newline at end of file
++}

dotnet3.1-gcc11.patch

@@ -1,19 +0,0 @@
-diff --git a/src/core-setup.1721e3943939f9af7d5effa702bb7e9b99e254f1/src/corehost/cli/test/nativehost/host_context_test.cpp b/src/core-setup.1721e3943939f9af7d5effa702bb7e9b99e254f1/src/corehost/cli/test/nativehost/host_context_test.cpp
-index e6dc9f6d8..d42c0e0f2 100644
---- a/src/core-setup.1721e3943939f9af7d5effa702bb7e9b99e254f1/src/corehost/cli/test/nativehost/host_context_test.cpp
-+++ b/src/core-setup.1721e3943939f9af7d5effa702bb7e9b99e254f1/src/corehost/cli/test/nativehost/host_context_test.cpp
-@@ -11,6 +11,7 @@
- #include <corehost_context_contract.h>
- #include "host_context_test.h"
- #include <utils.h>
-+#include <thread>
- 
- namespace
- {
-@@ -539,4 +540,4 @@ bool host_context_test::load_assembly_and_get_function_pointer(
-     hostfxr_exports hostfxr{ hostfxr_path };
- 
-     return load_assembly_and_get_function_pointer(hostfxr, config_path, argc, argv, config_log_prefix, test_output);
--}
-\ No newline at end of file
-+}

dotnet3.1.spec

@@ -21,10 +21,10 @@
 %define _lto_cflags %{nil}
 
 
-%global host_version 3.1.10
-%global runtime_version 3.1.10
+%global host_version 3.1.11
+%global runtime_version 3.1.11
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 3.1.110
+%global sdk_version 3.1.111
 # upstream can update releases without revving the SDK version so these don't always match
 %global src_version %{sdk_version}
 %global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -55,7 +55,7 @@
 
 Name:           dotnet3.1
 Version:        %{sdk_rpm_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        .NET Core 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/
@@ -83,15 +83,16 @@ Patch200:       coreclr-hardening-flags.patch
 # Patch201:       coreclr-clang10.patch
 # Fix build on recent versions of gcc/clang
 # https://github.com/libunwind/libunwind/pull/166
-Patch202:       coreclr-libunwind-fno-common.patch
+# Already applied
+#Patch202:       coreclr-libunwind-fno-common.patch
 
 # Build with with hardening flags, including -pie
 Patch300:       core-setup-hardening-flags.patch
+Patch301:       core-setup-gcc11.patch
 
 # Disable telemetry by default; make it opt-in
 Patch500:       cli-telemetry-optout.patch
 
-Patch600:       %{name}-gcc11.patch
 
 %if 0%{?fedora} > 32 || 0%{?rhel} > 8
 ExclusiveArch:  aarch64 x86_64
@@ -364,18 +365,18 @@ popd
 pushd src/coreclr.*
 %patch200 -p1
 #%%patch201 -p1
-%patch202 -p1
+#%%patch202 -p1
 popd
 
 pushd src/core-setup.*
 %patch300 -p1
+%patch301 -p1
 popd
 
 pushd src/cli.*
 %patch500 -p1
 popd
 
-%patch600 -p1
 
 # If CLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE is misisng, add it back
 grep CLR_CMAKE_USE_SYSTEM_LIBUNWIND repos/coreclr.common.props || \
@@ -555,6 +556,9 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Fri Jan 15 2021 Omair Majid <omajid@redhat.com> - 3.1.111-1
+- Update to .NET Core SDK 3.1.111 and Runtime 3.1.11
+
 * Sun Dec 06 2020 Jeff Law <law@redhat.com> - 3.1.110-2
 - Fix missing #include for gcc-11
 

sources

@@ -1 +1 @@
-SHA512 (dotnet-v3.1.110-SDK.tar.gz) = d283c01d19dd426cc6756e53b81c10477113a8f142966b09a0e1a22be6932e6d01ea1d0f72d7cf55d4fbe302418079b7e107cf122181a95540765068afeaeb00
+SHA512 (dotnet-v3.1.111-SDK.tar.gz) = e65b8b96a0814a4a3fb9f56d2bde8f0f851fdeeeb1ce9980945994a0194aa1deabdb14141e0b77a09feaaf6a515565a337e7cac56be8ef663ca8ec127556b4e7

tests/tests.yml

@@ -9,6 +9,7 @@
     repositories:
     - repo: "https://github.com/redhat-developer/dotnet-regular-tests.git"
       dest: "dotnet-regular-tests"
+      version: "main"
     tests:
       - download_test_runner:
           dir: ./

update-release

@@ -54,7 +54,7 @@ sed -i -E "s|^%global sdk_version [[:digit:]]\.[[:digit:]]\.[[:digit:]][[:digit:
 
 comment="Update to .NET Core SDK ${sdk_version} and Runtime ${runtime_version}"
 
-rpmdev-bumpspec --comment="$comment" $spec_file
+rpmdev-bumpspec -D --comment="$comment" $spec_file
 
 # Reset release to 1 in 'Release' tag
 sed -i -E 's|^Release:        [[:digit:]]+%|Release:        1%|' $spec_file