diff --git a/.gitignore b/.gitignore index 50734eb..6ddb020 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,5 @@ /dotnet-8.0.125.tar.gz.sig /dotnet-8.0.126.tar.gz /dotnet-8.0.126.tar.gz.sig +/dotnet-8.0.127.tar.gz +/dotnet-8.0.127.tar.gz.sig diff --git a/dotnet8.0.spec b/dotnet8.0.spec index 508c7b1..506ed79 100644 --- a/dotnet8.0.spec +++ b/dotnet8.0.spec @@ -12,16 +12,16 @@ # dotnet-host and netstandard-targeting-pack-2.1 %global is_latest_dotnet 0 -%global host_version 8.0.26 -%global runtime_version 8.0.26 -%global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 8.0.126 +%global host_version 8.0.27 +%global runtime_version 8.0.27 +%global aspnetcore_runtime_version 8.0.27 +%global sdk_version 8.0.127 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') # upstream can produce releases with a different tag than the SDK or Runtime version -%global upstream_tag v%{sdk_version} +%global upstream_tag v8.0.127 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global host_rpm_version %{host_version} @@ -780,6 +780,10 @@ export COMPlus_LTTng=0 %changelog +* Thu May 28 2026 Omair Majid - 8.0.127-2 +- Update to .NET SDK 8.0.127 and Runtime 8.0.27 +- Resolves: RHEL-173922 + * Fri Apr 17 2026 Omair Majid - 8.0.126-2 - Update to .NET SDK 8.0.126 and Runtime 8.0.26 - Resolves: RHEL-163419 diff --git a/release.json b/release.json index 97e98b9..d871270 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.26", + "release": "8.0.27", "channel": "8.0", - "tag": "v8.0.126", - "sdkVersion": "8.0.126", - "runtimeVersion": "8.0.26", - "aspNetCoreVersion": "8.0.26", + "tag": "v8.0.127", + "sdkVersion": "8.0.127", + "runtimeVersion": "8.0.27", + "aspNetCoreVersion": "8.0.27", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "9096b5d74cb74ee028c10649c93e98c8c25ec687" + "sourceVersion": "56fc147a7ac76b53fb65b82756da001129b26cc4" } diff --git a/sources b/sources index 5c5b98a..0d6d17a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dotnet-8.0.126.tar.gz) = 6f5e6bba3a7a3854ff9e3bec12e1e63557d9273f61c96c49ffca1518c87956cbc79f6ee8faf25df29c846e5e4b1908bc1855d608172bf457c063531349832e0e -SHA512 (dotnet-8.0.126.tar.gz.sig) = 5472743bd162d67d976c80d01a5736a2ff2fdce3cd7c361d81b035abfb3184cf4dca1966c029a13406becbaf29b47d3ad6c73837cc7a382dbd5e9cd37215b41b +SHA512 (dotnet-8.0.127.tar.gz) = ba4d00aa416feed87f72fd0474ed4857e33f5ddd8903be139e159ac643fef6016b3f5e502d729db922451d701ce842fd5c33e059a7b98ad31985d58770db78c2 +SHA512 (dotnet-8.0.127.tar.gz.sig) = 5406f055bd8a4733fea8adc0b45ce939a229aa05db5e5ea4e0d528e73cdbd30b79347c3d9ee7f8547a2485494b496106ab563a71cb0a355b1e4fd8fc20bf82b2 diff --git a/update-release b/update-release index 7da2358..6aeb6cd 100755 --- a/update-release +++ b/update-release @@ -1,24 +1,89 @@ #!/bin/bash -# Usage: -# ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--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 sdk-version 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,49 +116,187 @@ while [[ "$#" -gt 0 ]]; do esac done -spec_files=( ./*.spec ) -spec_file="${spec_files[0]}" - -sdk_version=${positional_args[0]:-} -if [[ -z ${sdk_version} ]]; then - echo "error: missing sdk version" - exit 1 -fi - -runtime_version=${positional_args[1]:-} -if [[ -z ${runtime_version} ]]; then - echo "error: missing runtime version" - exit 1 -fi - -host_version="$runtime_version" - -tag=v${sdk_version} - set -x -sed -i -E "s|^%global host_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global host_version ${host_version}|" "$spec_file" -sed -i -E "s|^%global runtime_version [[:digit:]]\.[[:digit:]]\.[[:digit:]]+|%global runtime_version ${runtime_version}|" "$spec_file" -sed -i -E "s|^%global sdk_version [[:digit:]]\.[[:digit:]]\.[[:digit:]][[:digit:]][[:digit:]]|%global sdk_version ${sdk_version}|" "$spec_file" +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 -if [[ -f "dotnet-${tag}.tar.gz" ]]; then - echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball" +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 <