Update to .NET SDK 6.0.104 and Runtime 6.0.4

.gitignore

@@ -16,3 +16,4 @@
 /dotnet-v6.0.101.tar.gz
 /dotnet-v6.0.102.tar.gz
 /dotnet-v6.0.103.tar.gz
+/dotnet-v6.0.104.tar.gz

check-debug-symbols.py

@@ -65,11 +65,10 @@ def scan_file(file):
 
 def is_elf(file):
     result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True)
-    return re.search('ELF 64-bit LSB (?:pie )(?:executable|shared object)', result.stdout)
+    return re.search(r'ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)', result.stdout)
 
 def scan_file_if_sensible(file):
     if is_elf(file):
-        # print(file)
         return scan_file(file)
     return None
 

dotnet6.0.spec

@@ -20,10 +20,11 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}
 
-%global host_version 6.0.3
+%global host_version 6.0.4
-%global runtime_version 6.0.3
+%global runtime_version 6.0.4
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.103
+%global sdk_version 6.0.104
+%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 }')
 
@@ -85,7 +86,10 @@ Source11:       dotnet.sh.in
 Patch100:       runtime-arm64-lld-fix.patch
 # Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315
 Patch101:       runtime-mono-remove-ilstrip.patch
+# https://github.com/dotnet/runtime/pull/65392
 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
@@ -134,6 +138,7 @@ ExclusiveArch:  aarch64 x86_64 s390x
 ExclusiveArch:  x86_64
 %endif
 
+
 BuildRequires:  clang
 BuildRequires:  cmake
 BuildRequires:  coreutils
@@ -409,6 +414,7 @@ pushd src/runtime.*
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
+%patch103 -p1
 popd
 
 pushd src/command-line-api.*
@@ -465,10 +471,6 @@ pushd src/installer.*
 %patch1600 -p1
 popd
 
-# Disable package validation which breaks our build.
-# There's no need to run validation in RPM packages anyway.
-# See https://github.com/dotnet/runtime/pull/60881
-sed -i -E 's|( /p:BuildDebPackage=false)|\1 /p:EnablePackageValidation=false|' src/runtime.*/eng/SourceBuild.props
 
 %if ! %{use_bundled_libunwind}
 sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime.*/eng/SourceBuild.props
@@ -596,7 +598,6 @@ install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.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
 
-
 # Check debug symbols in all elf objects. This is not in %%check
 # because native binaries are stripped by rpm-build after %%install.
 # So we need to do this check earlier.
@@ -654,8 +655,7 @@ export COMPlus_LTTng=0
 %dir %{_libdir}/dotnet/sdk
 %{_libdir}/dotnet/sdk/%{sdk_version}
 %dir %{_libdir}/dotnet/sdk-manifests
-# FIXME hardcoded version?
+%{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version}
-%{_libdir}/dotnet/sdk-manifests/6.0.100
 %{_libdir}/dotnet/metadata
 %dir %{_libdir}/dotnet/packs
 
@@ -665,6 +665,9 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* 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
+
 * Thu Mar 10 2022 Omair Majid <omajid@redhat.com> - 6.0.103-1
 - Update to .NET SDK 6.0.103 and Runtime 6.0.3
 

runtime-66594-s390x-debuginfo.patch

@@ -0,0 +1,29 @@
+diff --git a/src/mono/mono.proj b/src/mono/mono.proj
+index fb98ffc1896..d6a0c9a8ec2 100644
+--- a/src/mono/mono.proj
++++ b/src/mono/mono.proj
+@@ -519,17 +519,17 @@
+       <!-- if all else fails in finding a valid objcopy, fall back to no-prefix from $PATH (used for x64 on CentOS) -->
+       <_Objcopy Condition="'$(_ObjcopyFound)' != '0'">objcopy</_Objcopy>
+     </PropertyGroup>
+-    <ItemGroup>
++    <ItemGroup Condition="'$(KeepNativeSymbols)' != 'true'">
+       <FilesToStrip Include="$(_MonoRuntimeFilePath)" />
+       <FilesToStrip Include="$([System.IO.Directory]::GetParent($(_MonoRuntimeFilePath)))\libmono-component-*$(SharedLibExt)" />
+       <FilesToStrip Include="$([System.IO.Directory]::GetParent($(_MonoRuntimeFilePath)))\Mono*framework\**\Mono*" Exclude="$([System.IO.Directory]::GetParent($(_MonoRuntimeFilePath)))\Mono*framework\**\*.dwarf" />
+     </ItemGroup>
+-    <Message Condition="'$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ($([MSBuild]::IsOSPlatform('OSX')) or $([MSBuild]::IsOSPlatform('Linux')))" Text="Stripping debug symbols from %(FilesToStrip.Identity)" Importance="High"/>
+-    <Exec Condition="!$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true')" Command="dsymutil --flat --minimize %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
+-    <Exec Condition="!$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true')" Command="strip -no_code_signature_warning -S %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
+-    <Exec Condition="!$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --only-keep-debug %(FilesToStrip.Identity) %(FilesToStrip.Identity).dbg" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
+-    <Exec Condition="!$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --strip-unneeded %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
+-    <Exec Condition="!$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --add-gnu-debuglink=%(FilesToStrip.Identity).dbg %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
++    <Message Condition="'@(FilesToStrip)' != '' and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ($([MSBuild]::IsOSPlatform('OSX')) or $([MSBuild]::IsOSPlatform('Linux')))" Text="Stripping debug symbols from %(FilesToStrip.Identity)" Importance="High"/>
++    <Exec Condition="'@(FilesToStrip)' != '' and !$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true')" Command="dsymutil --flat --minimize %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
++    <Exec Condition="'@(FilesToStrip)' != '' and !$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsOSX)' == 'true' or '$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true')" Command="strip -no_code_signature_warning -S %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
++    <Exec Condition="'@(FilesToStrip)' != '' and !$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --only-keep-debug %(FilesToStrip.Identity) %(FilesToStrip.Identity).dbg" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
++    <Exec Condition="'@(FilesToStrip)' != '' and !$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --strip-unneeded %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
++    <Exec Condition="'@(FilesToStrip)' != '' and !$([System.String]::Copy(%(FilesToStrip.Identity)).EndsWith('.a')) and '$(BuildMonoAOTCrossCompilerOnly)' != 'true' and ('$(TargetsLinux)' == 'true' or '$(TargetsAndroid)' == 'true')" Command="$(_Objcopy) --add-gnu-debuglink=%(FilesToStrip.Identity).dbg %(FilesToStrip.Identity)" IgnoreStandardErrorWarningFormat="true" WorkingDirectory="$(MonoObjDir)"/>
+   </Target>
+ 
+   <!-- Build AOT cross compiler (if available) -->

sources

@@ -1 +1 @@
-SHA512 (dotnet-v6.0.103.tar.gz) = 7fc7f9f8aa9b7491a72884ec08ea3269a35ee5d6295e19b8c9b4d5b61262bebcfeae8f945bf2bdb0f1cb4ebdfd57f9a06490e8062e0319494ddecc4606e8d052
+SHA512 (dotnet-v6.0.104.tar.gz) = db996788a8144f5438ff292537bb32f4953fce8fe8636ce41954d6206d03efa5a77bf456a7952119347169f5f5962ee3b95c0e73f35912b8ea0768ee3de09d3d