Update to .NET SDK 6.0.105 and Runtime 6.0.5

.gitignore

@@ -17,3 +17,4 @@
 /dotnet-v6.0.102.tar.gz
 /dotnet-v6.0.103.tar.gz
 /dotnet-v6.0.104.tar.gz
+/dotnet-v6.0.105.tar.gz

build-dotnet-tarball

@@ -118,9 +118,8 @@ fi
 if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then
     temp_dir=$(mktemp -d -p "$(pwd)")
     pushd "${temp_dir}"
-    git clone https://github.com/dotnet/installer
+    git clone https://github.com/dotnet/installer --branch "${tag}" --depth 1
     pushd installer
-    git checkout "${tag}"
     git submodule update --init --recursive
     clean_dotnet_cache
     mkdir -p "../${unmodified_tarball_name}"

dotnet6.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 6.0.4
+%global host_version 6.0.5
-%global runtime_version 6.0.4
+%global runtime_version 6.0.5
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.104
+%global sdk_version 6.0.105
 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|')
 %global templates_version %{runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -91,19 +91,8 @@ Patch102:       runtime-fedora-37-rid.patch
 # https://github.com/dotnet/runtime/pull/66594
 Patch103:       runtime-66594-s390x-debuginfo.patch
 
-# https://github.com/dotnet/command-line-api/pull/1401
-Patch300:       command-line-api-use-work-tree-with-git-apply.patch
-
-# https://github.com/microsoft/vstest/pull/3046
-Patch400:       vstest-use-work-tree-with-git-apply.patch
-
-# This is the suggestion from https://github.com/dotnet/source-build/pull/2450, applied
-Patch500:       fsharp-use-work-tree-with-git-apply.patch
 # Disable apphost, needed for s390x
-Patch501:       fsharp-no-apphost.patch
+Patch500:       fsharp-no-apphost.patch
-
-# This is the suggestion from https://github.com/dotnet/source-build/pull/2450, applied
-Patch600:       xliff-tasks-use-work-tree-with-git-apply.patch
 
 # Disable apphost, needed for s390x
 Patch700:       arcade-no-apphost.patch
@@ -417,21 +406,8 @@ pushd src/runtime.*
 %patch103 -p1
 popd
 
-pushd src/command-line-api.*
-%patch300 -p1
-popd
-
-pushd src/vstest.*
-%patch400 -p1
-popd
-
 pushd src/fsharp.*
 %patch500 -p1
-%patch501 -p1
-popd
-
-pushd src/xliff-tasks.*
-%patch600 -p1
 popd
 
 pushd src/arcade.*
@@ -458,10 +434,6 @@ pushd src/msbuild.*
 
 popd
 
-pushd src/aspnetcore.*
-
-popd
-
 pushd src/sdk.*
 %patch1500 -p1
 %patch1501 -p1
@@ -499,24 +471,28 @@ export CXXFLAGS="%{dotnet_cflags}"
 export LDFLAGS="%{dotnet_ldflags}"
 %endif
 
+# -fstack-clash-protection breaks CoreCLR
+CFLAGS=$(echo $CFLAGS  | sed -e 's/-fstack-clash-protection//' )
+CXXFLAGS=$(echo $CXXFLAGS  | sed -e 's/-fstack-clash-protection//' )
+
 %ifarch aarch64
 # -mbranch-protection=standard breaks unwinding in CoreCLR through libunwind
 CFLAGS=$(echo $CFLAGS | sed -e 's/-mbranch-protection=standard //')
 CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-mbranch-protection=standard //')
 %endif
 
-# -fstack-clash-protection breaks CoreCLR
+%ifarch s390x
-CFLAGS=$(echo $CFLAGS  | sed -e 's/-fstack-clash-protection//' )
+# -march=z13 -mtune=z14 makes clang crash while compiling .NET
-CXXFLAGS=$(echo $CXXFLAGS  | sed -e 's/-fstack-clash-protection//' )
+CFLAGS=$(echo $CFLAGS | sed -e 's/ -march=z13//')
+CFLAGS=$(echo $CFLAGS | sed -e 's/ -mtune=z14//')
+CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -march=z13//')
+CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -mtune=z14//')
+%endif
 
 export EXTRA_CFLAGS="$CFLAGS"
 export EXTRA_CXXFLAGS="$CXXFLAGS"
 export EXTRA_LDFLAGS="$LDFLAGS"
 
-unset CFLAGS
-unset CXXFLAGS
-unset LDFLAGS
-
 # Disable tracing, which is incompatible with certain versions of
 # lttng See https://github.com/dotnet/runtime/issues/57784. The
 # suggested compile-time change doesn't work, unfortunately.
@@ -551,8 +527,8 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name 'vstest.console' -delete
 # Install managed symbols: disabled because they don't contain sources
 # but point to the paths the sources would have been at in the build
 # servers. The end user experience is pretty bad atm.
-# tar xf artifacts/%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%{runtime_id}-%{runtime_version}.tar.gz \
+# tar xf artifacts/%%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%%{runtime_id}-%%{runtime_version}.tar.gz \
-#    -C %{buildroot}/%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%{runtime_version}/
+#    -C %%{buildroot}/%%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%%{runtime_version}/
 
 # Fix executable permissions on files
 find %{buildroot}%{_libdir}/dotnet/ -type f -name 'apphost' -exec chmod +x {} \;
@@ -595,6 +571,7 @@ install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/
 install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts
 install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/
 
+
 # Quick and dirty check for https://github.com/dotnet/source-build/issues/2731
 test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/Sdk/Sdk.props
 
@@ -613,6 +590,7 @@ export COMPlus_LTTng=0
 %endif
 
 %{buildroot}%{_libdir}/dotnet/dotnet --info
+%{buildroot}%{_libdir}/dotnet/dotnet --version
 
 
 %files -n dotnet
@@ -665,6 +643,9 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Wed May 11 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
+- Update to .NET SDK 6.0.105 and Runtime 6.0.5
+
 * Tue Apr 12 2022 Omair Majid <omajid@redhat.com> - 6.0.104-1
 - Update to .NET SDK 6.0.104 and Runtime 6.0.4
 

sources

@@ -1 +1 @@
-SHA512 (dotnet-v6.0.104.tar.gz) = db996788a8144f5438ff292537bb32f4953fce8fe8636ce41954d6206d03efa5a77bf456a7952119347169f5f5962ee3b95c0e73f35912b8ea0768ee3de09d3d
+SHA512 (dotnet-v6.0.105.tar.gz) = a2b23b60d3b7792b909d685d78aff5f4ad44da4e43c0af353e08529da59edbc1683a843815035081beb4ffb24667c925514a0a999c829e457b7ffbeb37a40cbc

update-release

@@ -63,8 +63,8 @@ if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then
 else
     if [[ -n "${user_provided_tarball_name}" ]]; then
         ./rename-tarball "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz"
-    elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then
+    elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then
-        ./rename-tarball "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz"
+        ./rename-tarball "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
     elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then
         ./rename-tarball "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
     fi