From 41acfab9337ecb63b98488e9f71d5d29254b1a18 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Thu, 28 May 2026 13:19:10 -0400
Subject: [PATCH] Update to .NET SDK 9.0.117 and Runtime 9.0.16

Resolves: RHEL-173915
---
 .gitignore     |   2 +
 dotnet9.0.spec |  12 ++-
 release.json   |  12 +--
 sources        |   4 +-
 update-release | 215 ++++++++++++++++++++++++++++++++++++++++++-------
 5 files changed, 205 insertions(+), 40 deletions(-)

diff --git a/.gitignore b/.gitignore
index 70e04cc..47d3df8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,5 @@
 /dotnet-9.0.115.tar.gz.sig
 /dotnet-9.0.116.tar.gz
 /dotnet-9.0.116.tar.gz.sig
+/dotnet-9.0.117.tar.gz
+/dotnet-9.0.117.tar.gz.sig
diff --git a/dotnet9.0.spec b/dotnet9.0.spec
index 48afb12..2c86082 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.116
+%global upstream_tag v9.0.117
 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
 
 %global hostfxr_version %{runtime_version}
-%global runtime_version 9.0.15
-%global aspnetcore_runtime_version 9.0.15
-%global sdk_version 9.0.116
+%global runtime_version 9.0.16
+%global aspnetcore_runtime_version 9.0.16
+%global sdk_version 9.0.117
 %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 }')
@@ -899,6 +899,10 @@ export COMPlus_LTTng=0
 
 
 %changelog
+* Thu May 28 2026 Omair Majid <omajid@redhat.com> - 9.0.117-2
+- Update to .NET SDK 9.0.117 and Runtime 9.0.16
+- Resolves: RHEL-173915
+
 * Fri Apr 17 2026 Omair Majid <omajid@redhat.com> - 9.0.116-2
 - Update to .NET SDK 9.0.116 and Runtime 9.0.15
 - Resolves: RHEL-163389
diff --git a/release.json b/release.json
index 7d157b1..f1cdda8 100644
--- a/release.json
+++ b/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "9.0.15",
+  "release": "9.0.16",
   "channel": "9.0",
-  "tag": "v9.0.116",
-  "sdkVersion": "9.0.116",
-  "runtimeVersion": "9.0.15",
-  "aspNetCoreVersion": "9.0.15",
+  "tag": "v9.0.117",
+  "sdkVersion": "9.0.117",
+  "runtimeVersion": "9.0.16",
+  "aspNetCoreVersion": "9.0.16",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "aa545e77b216cb34bf86c4aa81aabd759d854bd0"
+  "sourceVersion": "14d5ddefede18b29eb0f2ea918c79861a5211177"
 }
diff --git a/sources b/sources
index be1ee4c..8e9a0df 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (dotnet-9.0.116.tar.gz) = f05ddc927bbf489d58e0354d25162680486e77399f305bd84a5c1ab5d6da54197165b8e893246398c21f10417379fca7bf5a49d7927fab637ab351b5b55cdd66
-SHA512 (dotnet-9.0.116.tar.gz.sig) = 55ba66ff776db6afbc2b3d61cd3a679086a939df1eee0a3b5d1a3f34cbf291541acb8eb4fa56d6e3af22187a9091306d80ceb9d20ece29e69c38bd509ce45a77
+SHA512 (dotnet-9.0.117.tar.gz) = ed68ecc072bfa4efeb82a79284c03b1bf4e155e63eb6ddffe3130ba981c2c26b824acb6e9e484a0c1f2679bfa89fcab75e8b7faa884565023b5e1f21d550f6cf
+SHA512 (dotnet-9.0.117.tar.gz.sig) = f00bbf8353b5fd92ad1197dcccecec92ab8d0a34edcd317f8ef76976f6c0279ae36953c8eee62b3e2ab59593ee15e4ca353fa13c5d09eef6c3acb2b9c3953a5e
diff --git a/update-release b/update-release
index 14f6849..6aeb6cd 100755
--- a/update-release
+++ b/update-release
@@ -1,24 +1,89 @@
 #!/bin/bash
 
-# Usage:
-#     ./update-release [runtime-version] [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release]
-
 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 [runtime-version] [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release]"
+    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;
@@ -30,11 +95,13 @@ while [[ "$#" -gt 0 ]]; do
             ;;
         --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;
             ;;
@@ -49,47 +116,109 @@ while [[ "$#" -gt 0 ]]; do
     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"
 
-runtime_version=${positional_args[1]:-}
+version=${positional_args[0]:-}
 sdk_version=""
-tag=v${sdk_version}
-if [[ -z ${runtime_version} ]]; then
-    if [[ -n "${release_json:-}" ]]; then
-        cp -a "${release_json}" release.json
+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
-        cat > query <<EOF
-        [ .[] | select(.name | contains(".NET 9.0")) ]
-        | 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
-        curl https://api.github.com/repos/dotnet/dotnet/releases \
-            | jq --from-file query > release.metadata.github
-        tag=$(jq -r .tag_name release.metadata.github)
-        curl -L "$(jq -r .release_manifest release.metadata.github)" -o release.json
+        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 <<EOF
+    [ .[] | select(.name == "$branch") ]
+    | first
+EOF
+    curl https://api.github.com/repos/dotnet/dotnet/branches \
+        | jq --from-file query > release.metadata.github
+    commit=$(jq -r .commit.sha release.metadata.github)
+    jq >release.json <<EOF
+{
+      "release": "$dotnet_major_minor_version",
+      "channel": "$dotnet_major_minor_version",
+      "tag": "$commit",
+      "sdkVersion": "$dotnet_major_minor_version",
+      "runtimeVersion": "$dotnet_major_minor_version",
+      "aspNetCoreVersion": "$dotnet_major_minor_version",
+      "sourceRepository": "https://github.com/dotnet/dotnet",
+      "sourceVersion": "$commit"
+}
+EOF
+    cat release.json
+    created_release_json=1
+elif [[ "${version}" == local ]]; then
+    cp -a "${release_json}" release.json
+else
+    echo "error: don't know what to do"
+    echo ""
+    print_usage
+    exit 1
+fi
+
+cat release.json
+
 aspnetcore_runtime_version=$(jq -r .aspNetCoreVersion release.json)
 runtime_version=$(jq -r .runtimeVersion release.json)
 sdk_version=$(jq -r .sdkVersion release.json)
 tag=$(jq -r .tag release.json)
-tag_without_v=$(echo ${tag} | sed -e 's|^v||')
+tag_without_v=${tag#v}
 
 echo "Updating .NET $dotnet_major_minor_version to SDK ${sdk_version} and Runtime ${runtime_version}"
 
+if [[ $bootstrap == 0 ]]; then
+    sed -i -E "s|^%bcond_with.*bootstrap$|%bcond_with bootstrap|" "$spec_file"
+else
+    sed -i -E "s|^%bcond_with.*bootstrap$|%bcond_without bootstrap|" "$spec_file"
+fi
+
 sed -i -E "s|^%global upstream_tag .*$|%global upstream_tag ${tag}|" "$spec_file"
 
+if [[ "$dotnet_major_minor_version" == "8.0" ]]; then
+    sed -i -E "s|^%global host_version .*$|%global host_version ${runtime_version}|" "$spec_file"
+    # other major versions set/define host_version as a variable based on runtime_version.
+fi
 sed -i -E "s|^%global runtime_version .*$|%global runtime_version ${runtime_version}|" "$spec_file"
 sed -i -E "s|^%global aspnetcore_runtime_version .*$|%global aspnetcore_runtime_version ${aspnetcore_runtime_version}|" "$spec_file"
 sed -i -E "s|^%global sdk_version .*$|%global sdk_version ${sdk_version}|" "$spec_file"
@@ -114,18 +243,36 @@ 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"
+    # signature file can be located anywhere under the directory tree, so find it.
     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}")
+    if [[ "${signature_path}" == "" ]]; then
+        echo "error: unable to find signature file for ${user_provided_tarball_name}"
+        exit 1
+    fi
     cp -a "${signature_path}" "dotnet-${tag_without_v}.tar.gz.sig"
-else
-    rm -f release.json
+else # Download the original/pristine bits from upstream
+    if [[ $created_release_json == 0 ]]; then
+        # If we didn't create the release.json, then delete it so spectool -g can download a fresh copy
+        rm -f release.json
+    fi
     spectool -g "$spec_file"
-    if spectool -l "$spec_file" | grep 'bootstrap.tar.gz' ; then
+fi
+
+# TODO add optional gpg signature verification
+
+if [[ $bootstrap == 1 ]]; then
+    if [[ $dotnet_major_minor_version == 8.0 ]]; then
+        # TODO: create generic bootstrap support for 8.0
+        echo "--bootstrap not implemented for .NET 8.0"
+        exit 1
+    elif [[ $dotnet_major_minor_version == 9.0 ]]; then
+        # For .NET 9, we bootstrap x64 and aarch64 using Microsoft binaries, and ppc64le and s390x using custom binaries
         ./build-dotnet-bootstrap-tarball "$tag"
-        tar xf dotnet-"$tag"-x64-bootstrap.tar.gz "dotnet-$tag-x64-bootstrap/global.json"
+        tar xf "dotnet-$tag-x64-bootstrap.tar.gz" "dotnet-$tag-x64-bootstrap/global.json"
         bootstrap_sdk_version=$(jq -r .tools.dotnet "dotnet-$tag-x64-bootstrap/global.json")
         sed -i -E "s|^(%global bootstrap_sdk_version) .*$|\1 ${bootstrap_sdk_version}|" "$spec_file"
         spectool -g "$spec_file"
@@ -133,11 +280,23 @@ else
         if [ -f re-build-all-bootstrap ]; then
             ./re-build-all-bootstrap "${tag}"
         fi
+    else
+        # For .NET 10 and later, defer all bootstrapping to build-dotnet-bootstrap-tarball script
+        tar xf "dotnet-${tag_without_v}.tar.gz" "dotnet-${tag_without_v}/global.json"
+        bootstrap_sdk_version=$(jq -r .tools.dotnet "dotnet-${tag_without_v}/global.json")
+        sed -i -E "s|^(%global bootstrap_sdk_version) .*$|\1 ${bootstrap_sdk_version}|" "$spec_file"
+
+        ./build-dotnet-bootstrap-tarball "${tag_without_v}"
+
+        if [ -f dotnet-prebuilts*ppc64le*tar.gz ]; then
+            file_name=$(ls -1 -t dotnet-prebuilts-*-ppc64le.tar.gz | head -1)
+            bootstrap_sdk_version_ppc64le_s390x=$(basename "$file_name" | sed -E -e 's/dotnet-prebuilts-//' -e 's/-ppc64le.tar.gz//')
+
+            sed -E -i "s|^%global bootstrap_sdk_version_ppc64le_s390x .*$|%global bootstrap_sdk_version_ppc64le_s390x $bootstrap_sdk_version_ppc64le_s390x|" "$spec_file"
+        fi
     fi
 fi
 
-set -x
-
 comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}"
 commit_message="$comment
 "