From 28256feff896a12b1fc83dce2ef575e629e2caf1 Mon Sep 17 00:00:00 2001 From: Satish Mane Date: Thu, 23 Jul 2026 17:05:54 +0530 Subject: [PATCH] Update to .NET SDK 9.0.119 and Runtime 9.0.18 Resolves: RHEL-192471 --- .gitignore | 2 + dotnet9.0.spec | 14 ++- release.json | 12 +- sources | 4 +- update-release | 327 ------------------------------------------------- 5 files changed, 19 insertions(+), 340 deletions(-) delete mode 100755 update-release diff --git a/.gitignore b/.gitignore index 72ea385..09940e2 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ /dotnet-9.0.117.tar.gz.sig /dotnet-9.0.118.tar.gz /dotnet-9.0.118.tar.gz.sig +/dotnet-9.0.119.tar.gz +/dotnet-9.0.119.tar.gz.sig diff --git a/dotnet9.0.spec b/dotnet9.0.spec index 67314e9..01c3b31 100644 --- a/dotnet9.0.spec +++ b/dotnet9.0.spec @@ -14,13 +14,13 @@ # upstream can produce releases with a different tag than the SDK version #%%global upstream_tag v%%{runtime_version} -%global upstream_tag v9.0.118 +%global upstream_tag v9.0.119 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global hostfxr_version %{runtime_version} -%global runtime_version 9.0.17 -%global aspnetcore_runtime_version 9.0.17 -%global sdk_version 9.0.118 +%global runtime_version 9.0.18 +%global aspnetcore_runtime_version 9.0.18 +%global sdk_version 9.0.119 %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 }') @@ -74,7 +74,7 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 3%{?dist} +Release: 2%{?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 @@ -977,6 +977,10 @@ export COMPlus_LTTng=0 %changelog +* Thu Jul 23 2026 Satish Mane - 9.0.119-2 +- Update to .NET SDK 9.0.119 and Runtime 9.0.18 +- Resolves: RHEL-192471 + * Thu Jul 02 2026 Tom Deseyn - 9.0.118-3 - Reduce time to detect hanging builds - Resolves: RHEL-191642 diff --git a/release.json b/release.json index 9d90ea8..5f4cae0 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.17", + "release": "9.0.18", "channel": "9.0", - "tag": "v9.0.118", - "sdkVersion": "9.0.118", - "runtimeVersion": "9.0.17", - "aspNetCoreVersion": "9.0.17", + "tag": "v9.0.119", + "sdkVersion": "9.0.119", + "runtimeVersion": "9.0.18", + "aspNetCoreVersion": "9.0.18", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "0e130a2a48932020769116917601ab164ad8d781" + "sourceVersion": "d088fc83496a99a5785ecdf74c012f61a335c338" } diff --git a/sources b/sources index f68e41c..6ad511c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dotnet-9.0.118.tar.gz) = 7fcafd75240c84469605acaa2e639e522579984c2e0af9706e322d41543d250ad6d56d4d10d3ff2084ed4bedf280d1359eaefd0323bdf51b9e2884b1f49fcd61 -SHA512 (dotnet-9.0.118.tar.gz.sig) = 9d9ed153c8562ad821f042e9510e8b50b98bd29a2ba6166f28f97fb4ac89ba23633eeb53efa498686e82ffe853fb1494c4404627a6e5c82180a21cbeafcb1c64 +SHA512 (dotnet-9.0.119.tar.gz) = bdb5e0bd73b7edf0cc7bf72d9ef07a31691c442bf436e1e25c7d3ac5ee02768bf405a28c004df62db1bb3f0553cb47d6dbd894106667186c7187a13138e23a09 +SHA512 (dotnet-9.0.119.tar.gz.sig) = c7529e07348ec4506bf930c70dede49ac16ef6cfe5d0d66a767c26275387de98c153f1adcbc8d921fccad8786cee42f8004d67dbc914a26e1dbd83df6a76f386 diff --git a/update-release b/update-release deleted file mode 100755 index 6aeb6cd..0000000 --- a/update-release +++ /dev/null @@ -1,327 +0,0 @@ -#!/bin/bash - -set -euo pipefail -IFS=$'\n\t' - -# Notes: this only works with 1xx sdks, the versions shipped in Fedora/RHEL/CentOS Stream. - -print_usage() { - echo " Usage:" - echo " ./update-release [VERSION] [--bootstrap] [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release]" - echo "" - echo "VERSION can be:" - echo " - latest-release: latest release for this major.minor version of .NET (default unless --release-json and --tarball are used)" - echo " - exact version (SDK or runtime, eg, 9.0.5 or 10.0.124)" - echo " - omitted if --release-json and --tarball are used (uses local mode)" - echo " - latest-commit: the latest commit for this major.minor version of .NET" - echo "" - echo "If not specified, 'latest-release' is the default." - echo "" - echo "When done, it creates the following files:" - echo " - release.json" - echo " - git-commit-message: commit message to use with the git commit for the update" - echo "" - echo "" - echo "Options:" - echo " --bootstrap Build binary bootstrap artifacts for this release." - echo " --bug bug-id Add the named bug/issue identifier to the changelog and commit message." - echo " --tarball tarball-name Use the supplied tarball. Use with --release-json." - echo " --release-json release-json Use the supplied release.json. Use with --tarball." - echo " --larger-rpm-release Set the release to 2." - echo "" -} - -download_release_json() { - version=$1 - if [[ "$version" =~ ^[0-9]+\.[0-9]+$ ]]; then - # major.minor format. intentionally filter to major.minor.1xx. - cat > query <<'EOF' - [ .[] | select(.name | test("\\.NET .*\($v)(\\.1\\d{2}| (Preview|RC) \\d+)")) ] - | first - | { tag_name: .tag_name, - tarball: .tarball_url, - signature: .assets[].browser_download_url | select(. | endswith("tar.gz.sig")), - release_manifest: .assets[] | select(.name == "release.json") | .browser_download_url } -EOF - elif [[ "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then - # major.minor.patch. Might be the SDK version or Runtime version - cat > query <<'EOF' - [ .[] | select(.name | test("\\.NET .*\($v)")) ] - | first - | { tag_name: .tag_name, - tarball: .tarball_url, - signature: .assets[].browser_download_url | select(. | endswith("tar.gz.sig")), - release_manifest: .assets[] | select(.name == "release.json") | .browser_download_url } -EOF - else - echo "error: unable to parse $version" - exit 1 - fi - curl https://api.github.com/repos/dotnet/dotnet/releases \ - | jq --arg v "$version" --from-file query > release.metadata.github - curl -L "$(jq -r .release_manifest release.metadata.github)" -o release.json -} - -assert_file_exists() { - file=$1 - if [[ ! -f "${file}" ]]; then - echo "error: ${file} not found" - exit 1 - fi -} - - -user_provided_tarball_name="" - -rpm_release=1 -positional_args=() -bug_ids=() -bootstrap=0 -while [[ "$#" -gt 0 ]]; do - arg="$1" - case "${arg}" in - --bootstrap) - bootstrap=1 - shift; - ;; - --bug) - bug_ids+=("$2") - shift; - shift; - ;; - -h|--help) - print_usage - exit 0 - ;; - --release-json) - release_json="$2" - assert_file_exists "${release_json}" - shift; - shift; - ;; - --tarball) - user_provided_tarball_name="$2" - assert_file_exists "${user_provided_tarball_name}" - shift; - shift; - ;; - --larger-rpm-release) - rpm_release="2" - shift; - ;; - *) - positional_args+=("$1") - shift - ;; - esac -done - -set -x - -spec_files=( ./*.spec ) -spec_file="${spec_files[0]}" -assert_file_exists "$spec_file" - -dotnet_major_minor_version=$spec_file -dotnet_major_minor_version=${dotnet_major_minor_version#./dotnet} -dotnet_major_minor_version=${dotnet_major_minor_version%.spec} -if ! [[ "$dotnet_major_minor_version" =~ ^[0-9]+\.[0-9]+$ ]]; then - echo "error: Unable to guess the current .NET major.minor version. Expected to get a two-digit .NET version, but got $dotnet_major_minor_version"; - exit 1 -fi - -echo "Updating .NET $dotnet_major_minor_version" - -version=${positional_args[0]:-} -sdk_version="" -created_release_json=0 - -if [[ ${version} == "" ]]; then - if [[ -n "${release_json:-}" ]] || [[ -n "${user_provided_tarball_name:-}" ]]; then - if [[ -n "${release_json:-}" ]] && [[ -n "${user_provided_tarball_name:-}" ]]; then - version=local - else - echo "error: please provide both --release-json and --tarball for local-only mode" - exit 1 - fi - else - version=latest-release - fi -fi - -if [[ ${version} == latest-release ]]; then - if [[ -n "${release_json:-}" ]]; then - echo "error: don't know how to combine upstream latest release's release.json with the locally supplied one" - exit 1 - fi - download_release_json "${dotnet_major_minor_version}" -elif [[ "$version" =~ ^[0-9]+\.[0-9]+\.[0-9]+ ]]; then # matches x.y.z (and x.y.z-preview.N, etc.) - if [[ -n "${release_json:-}" ]] && [[ -n "${user_provided_tarball_name:-}" ]] ; then - echo "error: don't know how to combine explicit upstream version with release.json and tarball" - exit 1 - fi - download_release_json "${version}" -elif [[ ${version} == latest-commit ]]; then - branch=release/${dotnet_major_minor_version}.1xx - if [[ ${dotnet_major_minor_version} == 11.0 ]]; then - branch=main - fi - - cat > query < release.metadata.github - commit=$(jq -r .commit.sha release.metadata.github) - jq >release.json < git-commit-message - -rpmdev-bumpspec --comment="$comment" "$spec_file" - -# Reset release in 'Release' tag -sed -i -E 's|^Release: [[:digit:]]+%|Release: '"$rpm_release"'%|' "$spec_file" -# 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"