From ca314aea2e4a7b2d927cebae92a5012225919bf6 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Fri, 17 Oct 2025 09:15:25 -0400 Subject: [PATCH] Update to .NET SDK 10.0.100-rc.2.25502.107 and Runtime 10.0.0-rc.2.25502.107 Resolves: RHEL-121559 --- .gitignore | 2 ++ dotnet10.0.spec | 31 ++++++++++++++++--------------- release.json | 16 ++++++++-------- sources | 8 ++------ update-release | 9 ++++++++- 5 files changed, 36 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index bb1b6b2..a98be90 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,5 @@ /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 +/dotnet-source-10.0.100-rc.2.25502.107.tar.gz +/dotnet-source-10.0.100-rc.2.25502.107.tar.gz.sig diff --git a/dotnet10.0.spec b/dotnet10.0.spec index 1e4724e..31105af 100644 --- a/dotnet10.0.spec +++ b/dotnet10.0.spec @@ -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-rc.1.25451.107 +%global upstream_tag v10.0.100-rc.2.25502.107 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global hostfxr_version %{runtime_version} -%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 runtime_version 10.0.0-rc.2.25502.107 +%global aspnetcore_runtime_version 10.0.0-rc.2.25502.107 +%global sdk_version 10.0.100-rc.2.25502.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~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 runtime_rpm_version 10.0.0~rc.2.25502.107 +%global aspnetcore_runtime_rpm_version 10.0.0~rc.2.25502.107 +%global sdk_rpm_version 10.0.100~rc.2.25502.107 %global use_bundled_brotli 0 %global use_bundled_libunwind 1 @@ -77,14 +77,15 @@ 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 URL: https://github.com/dotnet/ -Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz -Source1: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/dotnet-%{upstream_tag_without_v}.tar.gz.sig +#Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%%{upstream_tag}.tar.gz#/dotnet-%%{upstream_tag_without_v}.tar.gz +Source0: https://builds.dotnet.microsoft.com/dotnet/source-build/dotnet-source-%{upstream_tag_without_v}.tar.gz +Source1: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/dotnet-source-%{upstream_tag_without_v}.tar.gz.sig Source2: https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc Source3: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json %if %{with bootstrap} @@ -462,7 +463,7 @@ if [[ ${release_json_tag} != %{upstream_tag} ]]; then exit 1 fi -%setup -q -n dotnet-%{upstream_tag_without_v} +%setup -q -c -n dotnet-source-%{upstream_tag_without_v} # Remove all prebuilts and binaries rm -rf .dotnet/ @@ -798,10 +799,6 @@ 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 - %check @@ -902,6 +899,10 @@ export COMPlus_LTTng=0 %changelog +* Fri Oct 17 2025 Omair Majid - 10.0.100~rc.2.25502.107-0.10 +- Update to .NET SDK 10.0.100-rc.2.25502.107 and Runtime 10.0.0-rc.2.25502.107 +- Resolves: RHEL-121559 + * Tue Sep 16 2025 Omair Majid - 10.0.100~rc.1.25451.107-0.9 - Disable bootstrap - Resolves: RHEL-114572 diff --git a/release.json b/release.json index b0e6839..f5f6bd4 100644 --- a/release.json +++ b/release.json @@ -1,11 +1,11 @@ { - "release": "10.0.0-rc.1", + "release": "10.0.0-rc.2", "channel": "10.0", - "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", + "tag": "v10.0.100-rc.2.25502.107", + "sdkVersion": "10.0.100-rc.2.25502.107", + "runtimeVersion": "10.0.0-rc.2.25502.107", + "aspNetCoreVersion": "10.0.0-rc.2.25502.107", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "2db1f5ee2bdda2e8d873769325fabede32e420e0", - "officialBuildId": "20250901.7" -} + "sourceVersion": "89c8f6a112d37d2ea8b77821e56d170a1bccdc5a", + "officialBuildId": "20251002.7" +} \ No newline at end of file diff --git a/sources b/sources index ea16200..8958484 100644 --- a/sources +++ b/sources @@ -1,6 +1,2 @@ -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 +SHA512 (dotnet-source-10.0.100-rc.2.25502.107.tar.gz) = eefa03f6e409274c3d5a29317c6e26badb991019bc9c8faa2172b7ead937032bf8829474da4dc5badfb92d33e2140c6d0121f8f996c8ec146f9efddc9b2770ca +SHA512 (dotnet-source-10.0.100-rc.2.25502.107.tar.gz.sig) = 4dec13df46b91f641630623778cd2509a0bb68b47975735f1e623a445f02648268f19dae7b4b1912ab855d099f35afd78506808f667d67d2774ef594a3af8191 diff --git a/update-release b/update-release index 7484e08..8d78649 100755 --- a/update-release +++ b/update-release @@ -163,7 +163,12 @@ if [[ -f "dotnet-${tag_without_v}.tar.gz" ]]; then echo "dotnet-${tag_without_v}.tar.gz already exists, not rebuilding tarball" elif [[ -n ${user_provided_tarball_name} ]]; then cp -a "${user_provided_tarball_name}" "dotnet-${tag_without_v}.tar.gz" - cp -a "${user_provided_tarball_name}.sig" "dotnet-${tag_without_v}.tar.gz.sig" + signature_name=$(basename "${user_provided_tarball_name}.sig") + user_tarball_dir=$(dirname "${user_provided_tarball_name}" ) + # intentionally unquoted, since it can be blank + # shellcheck disable=SC2116,SC2086 + signature_path=$(find $user_tarball_dir -iname "${signature_name}") + cp -a "${signature_path}" "dotnet-${tag_without_v}.tar.gz.sig" else if [[ $created_release_json == 0 ]] then rm -f release.json @@ -214,3 +219,5 @@ sed -i -E 's|^Release: [[:digit:]]+%|Release: '"$rpm_release"'%|' # Reset Release in changelog comment # See https://stackoverflow.com/questions/18620153/find-matching-text-and-replace-next-line sed -i -E '/^%changelog$/!b;n;s/-[[:digit:]]+$/-'"$rpm_release"'/' "$spec_file" + +echo "Done updating sources. Commit message in ./git-commit-message"