Update to .NET SDK 6.0.106 and Runtime 6.0.6

.gitignore

@@ -18,3 +18,4 @@
 /dotnet-v6.0.103.tar.gz
 /dotnet-v6.0.104.tar.gz
 /dotnet-v6.0.105.tar.gz
+/dotnet-v6.0.106.tar.gz

build-dotnet-tarball

@@ -182,19 +182,19 @@ fi
 # not-very-useful artifacts to reduce tarball size
 
 # Binaries for gradle
-rm -r src/aspnetcore.*/src/SignalR/clients/java/signalr/gradle*
+rm -r src/aspnetcore/src/SignalR/clients/java/signalr/gradle*
 
 # Unnecessary crypto implementation: IDEA
-rm -r src/runtime.*/src/tests/JIT/Performance/CodeQuality/Bytemark/
+rm -r src/runtime/src/tests/JIT/Performance/CodeQuality/Bytemark/
 
 # https://github.com/dotnet/aspnetcore/issues/34785
-find src/aspnetcore.*/src -type d -name samples -print0 | xargs -0 rm -r
+find src/aspnetcore/src -type d -name samples -print0 | xargs -0 rm -r
 
 # https://github.com/NuGet/Home/issues/11094
-rm -r src/nuget-client.*/test/EndToEnd
+rm -r src/nuget-client/test/EndToEnd
 
 # https://github.com/Humanizr/sample-aspnetmvc/issues/1
-rm -r src/source-build.*/src/humanizer/samples/
+rm -r src/source-build/src/humanizer/samples/
 
 popd
 

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.5
-%global runtime_version 6.0.5
+%global host_version 6.0.6
+%global runtime_version 6.0.6
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.105
+%global sdk_version 6.0.106
 %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,9 +91,18 @@ 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
+
 # Disable apphost, needed for s390x
 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
 
@@ -235,10 +244,10 @@ Requires:       dotnet-hostfxr-6.0%{?_isa} >= %{host_rpm_version}-%{release}
 # libicu is dlopen()ed
 Requires:       libicu%{?_isa}
 
-# See src/runtime.*/src/libraries/Native/AnyOS/brotli-version.txt
+# See src/runtime/src/libraries/Native/AnyOS/brotli-version.txt
 Provides: bundled(libbrotli) = 1.0.9
 %if %{use_bundled_libunwind}
-# See src/runtime.*/src/coreclr/pal/src/libunwind/libunwind-version.txt
+# See src/runtime/src/coreclr/pal/src/libunwind/libunwind-version.txt
 Provides: bundled(libunwind) = 1.5.rc1.28.g9165d2a1
 %endif
 
@@ -397,33 +406,46 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages
 %endif
 
 # Fix bad hardcoded path in build
-sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/native/corehost/hostmisc/pal.unix.cpp
+sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp
 
-pushd src/runtime.*
+pushd src/runtime
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
 popd
 
-pushd src/fsharp.*
+pushd src/command-line-api
+%patch300 -p1
+popd
+
+pushd src/vstest
+%patch400 -p1
+popd
+
+
+pushd src/fsharp
 %patch500 -p1
 popd
 
-pushd src/arcade.*
+pushd src/xliff-tasks
+%patch600 -p1
+popd
+
+pushd src/arcade
 %patch700 -p1
 popd
 
-pushd src/roslyn.*
+pushd src/roslyn
 %patch800 -p3
 %patch801 -p1
 popd
 
-pushd src/roslyn-analyzers.*
+pushd src/roslyn-analyzers
 %patch900 -p1
 popd
 
-pushd src/msbuild.*
+pushd src/msbuild
 
 # These are mono-specific fixes. Mono is only used on s390x. Restrict
 # patch to s390x to avoid potential risk in other architectures.
@@ -434,18 +456,18 @@ pushd src/msbuild.*
 
 popd
 
-pushd src/sdk.*
+pushd src/sdk
 %patch1500 -p1
 %patch1501 -p1
 popd
 
-pushd src/installer.*
+pushd src/installer
 %patch1600 -p1
 popd
 
 
 %if ! %{use_bundled_libunwind}
-sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime.*/eng/SourceBuild.props
+sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props
 %endif
 
 %build
@@ -550,7 +572,7 @@ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
 
 install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
 # dynamic completion needs the file to be named the same as the base command
-install src/sdk.*/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
+install src/sdk/scripts/register-completions.bash %{buildroot}/%{_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
@@ -643,6 +665,9 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Wed Jun 15 2022 Omair Majid <omajid@redhat.com> - 6.0.106-1
+- Update to .NET SDK 6.0.106 and Runtime 6.0.6
+
 * 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
 

rpminspect.yaml

@@ -5,6 +5,15 @@ inspections:
   emptyrpm: off
   # We patch upstream a lot, no need to reject patches
   patches: off
+badfuncs:
+  ignore:
+    # TODO This removes all badfuncs checks on libcoreclr! Use
+    # https://github.com/rpminspect/rpminspect/issues/573 to filter
+    # out the specific issues when that's available
+
+    # inet_addr: mono/s390x uses inet_addr for some internal
+    # debugging. See runtime/src/mono/mono/mini/cfgdump.c
+    - /usr/lib*/dotnet/shared/Microsoft.NETCore.App/6.0.*/libcoreclr.so
 runpath:
   # Upstream explicitly sets $ORIGIN/netcoredeps as an RPATH
   # See https://github.com/dotnet/core/blob/main/Documentation/self-contained-linux-apps.md

sources

@@ -1 +1 @@
-SHA512 (dotnet-v6.0.105.tar.gz) = a2b23b60d3b7792b909d685d78aff5f4ad44da4e43c0af353e08529da59edbc1683a843815035081beb4ffb24667c925514a0a999c829e457b7ffbeb37a40cbc
+SHA512 (dotnet-v6.0.106.tar.gz) = a069d75f94987a3e565d78e8e97f7a6cccbc6b2834c4543bdbc93e22a1c324159f8e2e661c410b22d7bba0ee766ca0d58ce7309d631aaa83736db6c3a44fb4c6

tests/tests.yml

@@ -28,6 +28,7 @@
     - dotnet-sdk-6.0
     - dotnet-runtime-6.0
     - expect
+    - file
     - git
     - jq
     - lldb