From 07ae284174e6e68e8e5bfba5919433a3b928c38c Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 16 Sep 2025 17:11:57 -0400 Subject: [PATCH] Update to .NET 10 RC 1 Resolves: RHEL-114571 --- .gitignore | 6 ++++++ dotnet10.0.spec | 42 +++++++++++++++++++++++++++--------------- release.json | 14 +++++++------- sources | 12 ++++++------ 4 files changed, 46 insertions(+), 28 deletions(-) diff --git a/.gitignore b/.gitignore index f5d71db..f4a5dbb 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,9 @@ /dotnet-prebuilts-10.0.100-preview.7.25322.101-x64.tar.gz /dotnet-prebuilts-10.0.100-preview.7.25380.108-ppc64le.tar.gz /dotnet-prebuilts-10.0.100-preview.7.25380.108-s390x.tar.gz +/dotnet-10.0.100-rc.1.25451.107.tar.gz +/dotnet-10.0.100-rc.1.25451.107.tar.gz.sig +/dotnet-prebuilts-10.0.100-rc.1.25420.111-x64.tar.gz +/dotnet-prebuilts-10.0.100-rc.1.25420.111-arm64.tar.gz +/dotnet-prebuilts-10.0.100-rc.1.25451.107-ppc64le.tar.gz +/dotnet-prebuilts-10.0.100-rc.1.25451.107-s390x.tar.gz diff --git a/dotnet10.0.spec b/dotnet10.0.spec index cbd76b0..29bbc5e 100644 --- a/dotnet10.0.spec +++ b/dotnet10.0.spec @@ -1,4 +1,4 @@ -%bcond_with bootstrap +%bcond_without bootstrap # LTO triggers a compilation error for a source level issue. Given that LTO should not # change the validity of any given source and the nature of the error (undefined enum), I @@ -14,20 +14,20 @@ # upstream can produce releases with a different tag than the SDK version #%%global upstream_tag v%%{runtime_version} -%global upstream_tag v10.0.100-preview.7.25380.108 +%global upstream_tag v10.0.100-rc.1.25451.107 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global hostfxr_version %{runtime_version} -%global runtime_version 10.0.0-preview.7.25380.108 -%global aspnetcore_runtime_version 10.0.0-preview.7.25380.108 -%global sdk_version 10.0.100-preview.7.25380.108 +%global runtime_version 10.0.0-rc.1.25451.107 +%global aspnetcore_runtime_version 10.0.0-rc.1.25451.107 +%global sdk_version 10.0.100-rc.1.25451.107 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{aspnetcore_runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') -%global runtime_rpm_version 10.0.0~preview.7.25380.108 -%global aspnetcore_runtime_rpm_version 10.0.0~preview.7.25380.108 -%global sdk_rpm_version 10.0.100~preview.7.25380.108 +%global runtime_rpm_version 10.0.0~rc.1.25451.107 +%global aspnetcore_runtime_rpm_version 10.0.0~rc.1.25451.107 +%global sdk_rpm_version 10.0.100~rc.1.25451.107 %global use_bundled_brotli 0 %global use_bundled_libunwind 1 @@ -77,7 +77,7 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 0.9%{?dist} +Release: 0.10%{?dist} Summary: .NET Runtime and SDK License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib @@ -89,7 +89,7 @@ Source2: https://dotnet.microsoft.com/download/dotnet/release-key-2023.as Source3: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json %if %{with bootstrap} # The bootstrap SDK version is one listed in the global.json file of the main source archive -%global bootstrap_sdk_version 10.0.100-preview.7.25322.101 +%global bootstrap_sdk_version 10.0.100-rc.1.25420.111 # The source is generated on a Fedora box via: # ./build-dotnet-bootstrap-tarball %%{upstream_tag} Source10: dotnet-prebuilts-%{bootstrap_sdk_version}-x64.tar.gz @@ -97,7 +97,7 @@ Source11: dotnet-prebuilts-%{bootstrap_sdk_version}-arm64.tar.gz # To generate ppc64le and s390x archives: # 1. Build the VMR commit in cross-build mode for the architecture # 2. Use `build-prebuilt-archive` to create the archive from the VMR -%global bootstrap_sdk_version_ppc64le_s390x 10.0.100-preview.7.25380.108 +%global bootstrap_sdk_version_ppc64le_s390x 10.0.100-rc.1.25451.107 Source12: dotnet-prebuilts-%{bootstrap_sdk_version_ppc64le_s390x}-ppc64le.tar.gz Source13: dotnet-prebuilts-%{bootstrap_sdk_version_ppc64le_s390x}-s390x.tar.gz %endif @@ -436,7 +436,7 @@ applications using the .NET SDK. } %dotnet_targeting_pack dotnet-apphost-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App %{dotnetver} Microsoft.NETCore.App.Host.%{runtime_id} -%dotnet_targeting_pack dotnet-targeting-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App.Ref %{dotnetver} Microsoft.NETCore.App.Ref +%dotnet_targeting_pack dotnet-targeting-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App %{dotnetver} Microsoft.NETCore.App.Ref %dotnet_targeting_pack aspnetcore-targeting-pack-%{dotnetver} %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App %{dotnetver} Microsoft.AspNetCore.App.Ref @@ -605,11 +605,16 @@ CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-march=x86-64-v3 //') LDFLAGS=$(echo $LDFLAGS | sed -e 's/-march=x86-64-v3 //') %endif - # Enabling fortify-source and "-Wall -Weverything" produces new warnings from libc. Turn them off. CFLAGS="$CFLAGS -Wno-used-but-marked-unused" CXXFLAGS="$CXXFLAGS -Wno-used-but-marked-unused" +%if 0%{?fedora} >= 43 || 0%{?rhel} > 10 +# -Wall includes Wjump-misses-init in newer clang versions +CFLAGS="$CFLAGS -Wno-jump-misses-init" +CXXFLAGS="$CXXFLAGS -Wno-jump-misses-init" +%endif + export EXTRA_CFLAGS="$CFLAGS" export EXTRA_CXXFLAGS="$CXXFLAGS" export EXTRA_LDFLAGS="$LDFLAGS" @@ -677,6 +682,7 @@ find -depth -name 'artifacts' -type d -print -exec rm -rf {} \; ./build.sh \ --source-only \ --release-manifest %{SOURCE3} \ + --branding default \ %if %{without bootstrap} --with-sdk previously-built-dotnet \ %endif @@ -808,8 +814,9 @@ rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt rm %{buildroot}%{_libdir}/dotnet/dotnet %endif -# Removed by upstream in .NET 10 RC 1 -rm -r %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/ +# Removed by upstream in .NET 10 RC 2 +rm -r %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 +rmdir %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref @@ -900,6 +907,7 @@ export COMPlus_LTTng=0 %dir %{_libdir}/dotnet/packs %dir %{_libdir}/dotnet/packs/runtime.%{runtime_id}.Microsoft.DotNet.ILCompiler/ %{_libdir}/dotnet/packs/runtime.%{runtime_id}.Microsoft.DotNet.ILCompiler/%{runtime_version}* +%dir %{_libdir}/dotnet/packs/Microsoft.NETCore.App.Runtime.NativeAOT.%{runtime_id}/ %{_libdir}/dotnet/packs/Microsoft.NETCore.App.Runtime.NativeAOT.%{runtime_id}/%{runtime_version}* %endif @@ -910,6 +918,10 @@ export COMPlus_LTTng=0 %changelog +* Sun Sep 14 2025 Omair Majid - 10.0.100~rc.1.25451.107-0.10 +- Update to .NET 10 RC 1 +- Resolves: RHEL-114571 + * Tue Sep 09 2025 Omair Majid - 10.0.100~preview.7.25380.108-0.9 - Disable bootstrap - Related: RHEL-98678 diff --git a/release.json b/release.json index 98a497e..b0e6839 100644 --- a/release.json +++ b/release.json @@ -1,11 +1,11 @@ { - "release": "10.0.0-preview.7", + "release": "10.0.0-rc.1", "channel": "10.0", - "tag": "v10.0.100-preview.7.25380.108", - "sdkVersion": "10.0.100-preview.7.25380.108", - "runtimeVersion": "10.0.0-preview.7.25380.108", - "aspNetCoreVersion": "10.0.0-preview.7.25380.108", + "tag": "v10.0.100-rc.1.25451.107", + "sdkVersion": "10.0.100-rc.1.25451.107", + "runtimeVersion": "10.0.0-rc.1.25451.107", + "aspNetCoreVersion": "10.0.0-rc.1.25451.107", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "30000d883e06c122311a66894579bc12329a09d4", - "officialBuildId": "20250730.8" + "sourceVersion": "2db1f5ee2bdda2e8d873769325fabede32e420e0", + "officialBuildId": "20250901.7" } diff --git a/sources b/sources index 79a2227..ea16200 100644 --- a/sources +++ b/sources @@ -1,6 +1,6 @@ -SHA512 (dotnet-10.0.100-preview.7.25380.108.tar.gz) = b184ee69be14d98ed7c1bb4533b80f17f068460768359686c76c158a6751a36d4b2d5650d3cf4d54d300c42850d7e1400ed7ebfce86471742c1782748d2b89ec -SHA512 (dotnet-10.0.100-preview.7.25380.108.tar.gz.sig) = 4bbe073298bcd2e39a01bb8a441d6a0b7072e8d5f2fb341a31999be44218cd5b1cfd748f0372162c1813e651b895afccd04248e6e54c4f397910175233d94645 -SHA512 (dotnet-prebuilts-10.0.100-preview.7.25322.101-x64.tar.gz) = 0416ebb4d413352ec0573e50d9be2180f52c0716ed3dce780b741322276ef69a485a8b969fb8ced75b0019587cee4b12972a75c58626997fb146aa8d30dd6048 -SHA512 (dotnet-prebuilts-10.0.100-preview.7.25322.101-arm64.tar.gz) = dbdae008f37dc6e9f17442d91c1713ab6bcd8378657135ae34544a569c211c93124e16df04498d508e54c564c9aeee67af7768e45ae305aa8289b7b6650536a9 -SHA512 (dotnet-prebuilts-10.0.100-preview.7.25380.108-ppc64le.tar.gz) = 85ba57a93596e2ed0b655b076513f512e5e43004f4cd09c5a5a0579856b2c870a88f26d2ea31017096df6234e5bb51f53c49e6f1ea272cab4dc2011d21fbe68c -SHA512 (dotnet-prebuilts-10.0.100-preview.7.25380.108-s390x.tar.gz) = f297e251c22ee692ba7d02166486bae905b92031e2c0641ab62eace3ac2851fac23f45ba2b26865137346e75363571bf2a22a4b2cc8a81f806e5ef35f03f4f1b +SHA512 (dotnet-10.0.100-rc.1.25451.107.tar.gz) = 41de62257785dcd6f4d180b62f672b2a1fa599e8a63985ea1b578da340cca32a3905caf8699114ea370799bf3ba033bc6cc8e83e3498da34cf1cf178f7e982f7 +SHA512 (dotnet-10.0.100-rc.1.25451.107.tar.gz.sig) = ae8723da5fb35f3c103ec8819d08bb9c21666ed08c4b1bcad97c5ac0c1b7bc60f668a59feac9c0c0ce795905dab281aeabecc6a1a66aa2fd8d9fa8bb8d701133 +SHA512 (dotnet-prebuilts-10.0.100-rc.1.25420.111-x64.tar.gz) = 105df63912a12d1bef77004421840cd5fd32658a030ae80557c82dd4dc1b7c9c5a55c0b9c4cf56624adb64e444c9e902cf1a959769f169f18d7281a7357aacb7 +SHA512 (dotnet-prebuilts-10.0.100-rc.1.25420.111-arm64.tar.gz) = e53a53728a1200f308125d539efa6b578e33a6e504a5709de4edcfe3d262c00e25fbd25eda535ff356027ccc69dc6314a76fa43b25d96529aee1e5cf5c4acbce +SHA512 (dotnet-prebuilts-10.0.100-rc.1.25451.107-ppc64le.tar.gz) = 3f455b2ebe7d921162b286db98eadfdbe79769655a3419a8c10910ea66baa986e8346cee8c73cb95cf1d150400702d1b12f55c5bdb037c9b94cc81c1e59102e6 +SHA512 (dotnet-prebuilts-10.0.100-rc.1.25451.107-s390x.tar.gz) = ee3fdf8d01d11a682ac04603794fbe90ae9d489506139909f20b70bf2a026ef0e4e293c6c42cea85491849239f4ed47c426fdb40248adcafea13b001b284a44e