From 9619cdd5bba4431ad25e1702b1be3672e21b5124 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Tue, 14 Oct 2025 16:43:54 -0400 Subject: [PATCH] Update to .NET SDK 9.0.111 and Runtime 9.0.10 Resolves: RHEL-116861 --- .gitignore | 2 ++ dotnet9.0.spec | 34 ++++++++++++++++++++++++++++++---- release.json | 12 ++++++------ sources | 4 ++-- update-release | 11 +++++++++-- 5 files changed, 49 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index fa94995..cc77d4f 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ /dotnet-9.0.109.tar.gz.sig /dotnet-9.0.110.tar.gz /dotnet-9.0.110.tar.gz.sig +/dotnet-9.0.111.tar.gz +/dotnet-9.0.111.tar.gz.sig diff --git a/dotnet9.0.spec b/dotnet9.0.spec index e4dc058..25bf08b 100644 --- a/dotnet9.0.spec +++ b/dotnet9.0.spec @@ -8,15 +8,19 @@ %global dotnetver 9.0 +# Only the package for the latest dotnet version should provide RPMs like +# dotnet-host +%global is_latest_dotnet 0 + # upstream can produce releases with a different tag than the SDK version #%%global upstream_tag v%%{runtime_version} -%global upstream_tag v9.0.110 +%global upstream_tag v9.0.111 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global hostfxr_version %{runtime_version} -%global runtime_version 9.0.9 -%global aspnetcore_runtime_version 9.0.9 -%global sdk_version 9.0.110 +%global runtime_version 9.0.10 +%global aspnetcore_runtime_version 9.0.10 +%global sdk_version 9.0.111 %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 }') @@ -750,6 +754,7 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \; +%if %{is_latest_dotnet} install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ @@ -773,6 +778,7 @@ echo "%{_libdir}/dotnet" >> install_location install install_location %{buildroot}%{_sysconfdir}/dotnet/ echo "%{_libdir}/dotnet" >> install_location_%{runtime_arch} install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/ +%endif install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts install -m 0644 artifacts/assets/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ @@ -796,6 +802,18 @@ find %{buildroot}%{_libdir}/dotnet/sdk -type d | tail -n +2 | sed -E 's|%{buildr find %{buildroot}%{_libdir}/dotnet/sdk -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' >> dotnet-sdk-non-dbg-files find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-sdk-dbg-files +%if %{is_latest_dotnet} == 0 +# If this is an older version, self-test now, before we delete files. After we +# delete files, we will not have everything we need to self-test in %%check. +%{buildroot}%{_libdir}/dotnet/dotnet --info +%{buildroot}%{_libdir}/dotnet/dotnet --version + +# Provided by dotnet-host from another SRPM +rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt +rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt +rm %{buildroot}%{_libdir}/dotnet/dotnet +%endif + %check @@ -804,8 +822,10 @@ find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buil export COMPlus_LTTng=0 %endif +%if %{is_latest_dotnet} %{buildroot}%{_libdir}/dotnet/dotnet --info %{buildroot}%{_libdir}/dotnet/dotnet --version +%endif @@ -814,6 +834,7 @@ export COMPlus_LTTng=0 # empty package useful for dependencies %endif +%if %{is_latest_dotnet} %files -n dotnet-host %dir %{_libdir}/dotnet %{_libdir}/dotnet/dotnet @@ -832,6 +853,7 @@ export COMPlus_LTTng=0 %dir %{_datadir}/zsh %dir %{zsh_completions_dir} %{_datadir}/zsh/site-functions/_dotnet +%endif %files -n dotnet-hostfxr-%{dotnetver} %dir %{_libdir}/dotnet/host/fxr @@ -886,6 +908,10 @@ export COMPlus_LTTng=0 %changelog +* Tue Oct 14 2025 Omair Majid - 9.0.111-2 +- Update to .NET SDK 9.0.111 and Runtime 9.0.10 +- Resolves: RHEL-116861 + * Wed Sep 10 2025 Omair Majid - 9.0.110-2 - Update to .NET SDK 9.0.110 and Runtime 9.0.9 - Resolves: RHEL-112268 diff --git a/release.json b/release.json index ac4ad5b..8980b12 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.9", + "release": "9.0.10", "channel": "9.0", - "tag": "v9.0.110", - "sdkVersion": "9.0.110", - "runtimeVersion": "9.0.9", - "aspNetCoreVersion": "9.0.9", + "tag": "v9.0.111", + "sdkVersion": "9.0.111", + "runtimeVersion": "9.0.10", + "aspNetCoreVersion": "9.0.10", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "999243871ad8799c178193bb2d384dfbcfd94ce6" + "sourceVersion": "838867fec3d758e34188af097f4f18a23c3800e8" } diff --git a/sources b/sources index eb0743f..e1ff926 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dotnet-9.0.110.tar.gz) = 44c35209bd0d99cb63e9bc1f67bea3b2f4701a9ddd55a69998216122a6dea1dbf8063a2e5e280c70b45727c788fb6821bbaa59708f39846be403f7811b8ab3ba -SHA512 (dotnet-9.0.110.tar.gz.sig) = 766c28bedcfe70ec6e40bb75d77e60af1345c4d72c7e0a796517bd06ea4b3db08c3bb71eefd66e80fbe29e07f775e1004bdd8b527bcd44a486602d219c996f25 +SHA512 (dotnet-9.0.111.tar.gz) = 78f3dfe0811085a648d1ad226871881c47cbc014d515d3bbd7e987f74cd19f1b9f9c577b527f441da799ad1a59a53659b636634451f0ce4f7926593be4d3ccc1 +SHA512 (dotnet-9.0.111.tar.gz.sig) = 8720249f408cdf74fbae5ea024d406a8d5a27742de2de4a6317ee625ad318c0b2d90a7bde7516a6e51c6f6d7423f56cc1c61d36be057103a282ed4f15befd26d diff --git a/update-release b/update-release index 3593390..14f6849 100755 --- a/update-release +++ b/update-release @@ -1,7 +1,7 @@ #!/bin/bash # Usage: -# ./update-release [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release] +# ./update-release [runtime-version] [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release] set -euo pipefail IFS=$'\n\t' @@ -114,7 +114,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 rm -f release.json spectool -g "$spec_file" @@ -159,3 +164,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"