From 23ecb7defd467a4372956c99309c46ab0e69cfaf Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Mon, 15 Sep 2025 09:29:16 -0400 Subject: [PATCH] Update to RC 1 Resolves: RHEL-114572 --- .gitignore | 6 ++++++ dotnet10.0.spec | 33 ++++++++++++++++++++------------- release.json | 14 +++++++------- sources | 8 ++++++-- 4 files changed, 39 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index d81c3f1..bb1b6b2 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,9 @@ /dotnet-prebuilts-10.0.100-preview.6.25302.104-x64.tar.gz /dotnet-prebuilts-10.0.100-preview.6.25358.103-ppc64le.tar.gz /dotnet-prebuilts-10.0.100-preview.6.25358.103-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 9f56613..155bdce 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.0-preview.6.25358.103 +%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.6.25358.103 -%global aspnetcore_runtime_version 10.0.0-preview.6.25358.103 -%global sdk_version 10.0.100-preview.6.25358.103 +%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.6.25358.103 -%global aspnetcore_runtime_rpm_version 10.0.0~preview.6.25358.103 -%global sdk_rpm_version 10.0.100~preview.6.25358.103 +%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.7%{?dist} +Release: 0.8%{?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.6.25302.104 +%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.6.25358.103 +%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 @@ -666,6 +666,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 @@ -797,7 +798,9 @@ rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt rm %{buildroot}%{_libdir}/dotnet/dotnet %endif +# 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 @@ -871,8 +874,6 @@ export COMPlus_LTTng=0 %dir %{_libdir}/dotnet/sdk %dir %{_libdir}/dotnet/sdk-manifests %{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version}* -# FIXME is using a 8.0.100 version a bug in the SDK? -%{_libdir}/dotnet/sdk-manifests/8.0.100/ %{_libdir}/dotnet/metadata %ifnarch %{mono_archs} %{_libdir}/dotnet/library-packs @@ -890,6 +891,8 @@ 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 %files -n dotnet-sdk-%{dotnetver}-source-built-artifacts @@ -899,6 +902,10 @@ export COMPlus_LTTng=0 %changelog +* Sun Sep 14 2025 Omair Majid - 10.0.100~preview.6.25358.103-0.8 +- Update to RC 1 +- Resolves: RHEL-114572 + * Thu Sep 04 2025 Omair Majid - 10.0.100~preview.6.25358.103-0.7 - Drop netstandard-targeting-pack-2.1 - Resolves: RHEL-111815 diff --git a/release.json b/release.json index 7e368bb..b0e6839 100644 --- a/release.json +++ b/release.json @@ -1,11 +1,11 @@ { - "release": "10.0.0-preview.6", + "release": "10.0.0-rc.1", "channel": "10.0", - "tag": "v10.0.0-preview.6.25358.103", - "sdkVersion": "10.0.100-preview.6.25358.103", - "runtimeVersion": "10.0.0-preview.6.25358.103", - "aspNetCoreVersion": "10.0.0-preview.6.25358.103", + "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": "75972a5ba730bdaf7cf3a34f528ab0f5c7f05183", - "officialBuildId": "20250708.3" + "sourceVersion": "2db1f5ee2bdda2e8d873769325fabede32e420e0", + "officialBuildId": "20250901.7" } diff --git a/sources b/sources index efc2c68..ea16200 100644 --- a/sources +++ b/sources @@ -1,2 +1,6 @@ -SHA512 (dotnet-10.0.0-preview.6.25358.103.tar.gz) = 46285769f9f11455fae027d2c92fd2ee2754b05b19d174eac319cdee7ff2463dbc0539d42be926cd9cb0852b98dc5d1a42d1193d777edc6b33c480937ef778b7 -SHA512 (dotnet-10.0.0-preview.6.25358.103.tar.gz.sig) = 2d60152c308d39cc5e0dc08b5da4264583d6677bb856473aaa2d6649597a120953c8725525b98e4b11cba4712c61cf8cdaa610518e000dfb97162dc6823597c7 +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