Update to .NET SDK 8.0.129 and Runtime 8.0.29
Resolves: RHEL-192465
This commit is contained in:
Satish Mane
parent
1018dfa1c0
commit
d6b709adff
2
.gitignore
vendored
2
.gitignore
vendored
@ -86,3 +86,5 @@
|
||||
/dotnet-8.0.127.tar.gz.sig
|
||||
/dotnet-8.0.128.tar.gz
|
||||
/dotnet-8.0.128.tar.gz.sig
|
||||
/dotnet-8.0.129.tar.gz
|
||||
/dotnet-8.0.129.tar.gz.sig
|
||||
|
||||
@ -12,15 +12,15 @@
|
||||
# dotnet-host and netstandard-targeting-pack-2.1
|
||||
%global is_latest_dotnet 0
|
||||
|
||||
%global host_version 8.0.28
|
||||
%global runtime_version 8.0.28
|
||||
%global aspnetcore_runtime_version 8.0.28
|
||||
%global sdk_version 8.0.128
|
||||
%global host_version 8.0.29
|
||||
%global runtime_version 8.0.29
|
||||
%global aspnetcore_runtime_version 8.0.29
|
||||
%global sdk_version 8.0.129
|
||||
%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 }')
|
||||
|
||||
%global upstream_tag v8.0.128
|
||||
%global upstream_tag v8.0.129
|
||||
%global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
|
||||
|
||||
%global host_rpm_version %{host_version}
|
||||
@ -57,7 +57,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
|
||||
|
||||
@ -841,6 +841,10 @@ export COMPlus_LTTng=0
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 23 2026 Satish Mane <satmane@redhat.com> - 8.0.129-2
|
||||
- Update to .NET SDK 8.0.129 and Runtime 8.0.29
|
||||
- Resolves: RHEL-192465
|
||||
|
||||
* Thu Jul 02 2026 Tom Deseyn <tdeseyn@redhat.com> - 8.0.128-3
|
||||
- Reduce time to detect hanging builds
|
||||
- Resolves: RHEL-191649
|
||||
|
||||
12
release.json
12
release.json
@ -1,10 +1,10 @@
|
||||
{
|
||||
"release": "8.0.28",
|
||||
"release": "8.0.29",
|
||||
"channel": "8.0",
|
||||
"tag": "v8.0.128",
|
||||
"sdkVersion": "8.0.128",
|
||||
"runtimeVersion": "8.0.28",
|
||||
"aspNetCoreVersion": "8.0.28",
|
||||
"tag": "v8.0.129",
|
||||
"sdkVersion": "8.0.129",
|
||||
"runtimeVersion": "8.0.29",
|
||||
"aspNetCoreVersion": "8.0.29",
|
||||
"sourceRepository": "https://github.com/dotnet/dotnet",
|
||||
"sourceVersion": "b8c15cdca7da2fa00c82bc2ee538bd88af758b8f"
|
||||
"sourceVersion": "761968561827fbf9fd55e1259e7e0963b1a5613a"
|
||||
}
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (dotnet-8.0.128.tar.gz) = 6d405965f8d4c9afda7ac2ce33d7af7f9b6a316cf00951a447498ecf2152e2e1d6b5e4561d6535592e9fe1c5f18636547e754a00ad73ab230c8ac803f7f8b56f
|
||||
SHA512 (dotnet-8.0.128.tar.gz.sig) = 1e0a506faaa7a9dfa92f9abaca33b0bc11407f1f1fc41777a7b49f55ba7305050f9611845ce4f688fd64d5874226dc00843982c2842905710036017c20fba6b0
|
||||
SHA512 (dotnet-8.0.129.tar.gz) = 4b81d3f9d6d3ce54254dd70bd92e877cce5e044e2a0b362f5b893b5fa21e42141cf5809a03b1c7e4c91486820ebf749b4fbc0c738e4bc37315d7581f152261dc
|
||||
SHA512 (dotnet-8.0.129.tar.gz.sig) = d71afad1e91196b7cc589e1ed0e06103b1498dfed769fdf21eba4136ffb4b6268d7466cb5fda5d1f00393b1d808f969448b2ff86bd456c6adef1a600f2b1d0da
|
||||
|
||||
327
update-release
327
update-release
@ -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 <<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=${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"
|
||||
|
||||
if [[ $runtime_version = *preview* ]] || [[ $runtime_version = *rc* ]]; then
|
||||
# For Preview/RC releases, convert x.y.z-preview.a.b to x.y.z~preview.a.b (replace - with ~)
|
||||
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/#_handling_non_sorting_versions_with_tilde_dot_and_caret
|
||||
runtime_rpm_version=${runtime_version/-/\~}
|
||||
aspnetcore_runtime_rpm_version=${aspnetcore_runtime_version/-/\~}
|
||||
sdk_rpm_version=${sdk_version/-/\~}
|
||||
sed -i -E "s|^(%global runtime_rpm_version) .*$|\1 ${runtime_rpm_version}|" "$spec_file"
|
||||
sed -i -E "s|^(%global aspnetcore_runtime_rpm_version) .*$|\1 ${aspnetcore_runtime_rpm_version}|" "$spec_file"
|
||||
sed -i -E "s|^(%global sdk_rpm_version) .*$|\1 ${sdk_rpm_version}|" "$spec_file"
|
||||
else
|
||||
# For GA releases replace rpm versions with rpm macros for the actual version
|
||||
sed -i -E "s|^(%global runtime_rpm_version) .*$|\1 %{runtime_version}|" "$spec_file"
|
||||
sed -i -E "s|^(%global aspnetcore_runtime_rpm_version) .*$|\1 %{aspnetcore_runtime_version}|" "$spec_file"
|
||||
sed -i -E "s|^(%global sdk_rpm_version) .*$|\1 %{sdk_version}|" "$spec_file"
|
||||
fi
|
||||
|
||||
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 # 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"
|
||||
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"
|
||||
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"
|
||||
|
||||
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
|
||||
|
||||
comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}"
|
||||
commit_message="$comment
|
||||
"
|
||||
for bug_id in "${bug_ids[@]}"; do
|
||||
if [[ "$bug_id" =~ ^[[:digit:]]+$ ]]; then
|
||||
comment="$comment
|
||||
- Resolves: RHBZ#$bug_id"
|
||||
commit_message="$commit_message
|
||||
Resolves: RHBZ#$bug_id"
|
||||
else
|
||||
comment="$comment
|
||||
- Resolves: $bug_id"
|
||||
commit_message="$commit_message
|
||||
Resolves: $bug_id"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "$commit_message" > 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"
|
||||
Loading…
Reference in New Issue
Block a user