Update to .NET SDK 9.0.101 and Runtime 9.0.0
Resolves: RHEL-69750
This commit is contained in:
Omair Majid
parent
86b96b27d7
commit
a76de277b6
2
.gitignore
vendored
2
.gitignore
vendored
@ -14,3 +14,5 @@
|
||||
/dotnet-prebuilts-9.0.100-rc.1.24452.1-s390x.tar.gz
|
||||
/dotnet-9.0.0.tar.gz
|
||||
/dotnet-9.0.0.tar.gz.sig
|
||||
/dotnet-9.0.101.tar.gz
|
||||
/dotnet-9.0.101.tar.gz.sig
|
||||
|
||||
@ -10,13 +10,13 @@
|
||||
|
||||
# upstream can produce releases with a different tag than the SDK version
|
||||
#%%global upstream_tag v%%{runtime_version}
|
||||
%global upstream_tag v9.0.0
|
||||
%global upstream_tag v9.0.101
|
||||
%global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
|
||||
|
||||
%global hostfxr_version %{runtime_version}
|
||||
%global runtime_version 9.0.0
|
||||
%global aspnetcore_runtime_version 9.0.0
|
||||
%global sdk_version 9.0.100
|
||||
%global sdk_version 9.0.101
|
||||
%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 }')
|
||||
@ -70,7 +70,7 @@
|
||||
|
||||
Name: dotnet%{dotnetver}
|
||||
Version: %{sdk_rpm_version}
|
||||
Release: 1%{?dist}
|
||||
Release: 3%{?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
|
||||
|
||||
@ -843,6 +843,10 @@ export COMPlus_LTTng=0
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Dec 05 2024 Omair Majid <omajid@redhat.com> - 9.0.101-3
|
||||
- Update to .NET SDK 9.0.101 and Runtime 9.0.0
|
||||
- Resolves: RHEL-69750
|
||||
|
||||
* Wed Nov 20 2024 Omair Majid <omajid@redhat.com> - 9.0.100-0.9
|
||||
- Update to .NET SDK 9.0.100 and Runtime 9.0.0
|
||||
- Resolves: RHEL-65536
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
{
|
||||
"release": "9.0.0",
|
||||
"channel": "9.0",
|
||||
"tag": "v9.0.0",
|
||||
"sdkVersion": "9.0.100",
|
||||
"tag": "v9.0.101",
|
||||
"sdkVersion": "9.0.101",
|
||||
"runtimeVersion": "9.0.0",
|
||||
"aspNetCoreVersion": "9.0.0",
|
||||
"sourceRepository": "https://github.com/dotnet/dotnet",
|
||||
"sourceVersion": "a2bc464e40415d625118f38fbb0556d1803783ff"
|
||||
"sourceVersion": "f303476b533b0f90901c0a5e07a3bd2fb68777e3"
|
||||
}
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (dotnet-9.0.0.tar.gz) = cbfff90ed1abf74c876567952bf22b837c57e433e927d5966e641f5fad96d369a45aff7c26ebcf5f765f374ede991f0059f913d239dfb01a602929ace823bd2f
|
||||
SHA512 (dotnet-9.0.0.tar.gz.sig) = fe3b63c363d1086c4bafc41dd3f8c7673e9ffa16965e9a8c4104529a204a7e777dc46e187cc866a0e10372b99ddf85f4ba4454f4bedbbf227ede7c2874564d8f
|
||||
SHA512 (dotnet-9.0.101.tar.gz) = a422297fa72bb1ef78e42f597eb88a1a437b57a6fe792f4c9aa48bd826f861c650995462504e86be454a9b3a2a7404ed4754264a449b3a2166e46e207205b52d
|
||||
SHA512 (dotnet-9.0.101.tar.gz.sig) = cdf10b7d39ce169d6b59a3d0a4999c994c06909b5d906319275a12dd984fb3cdbb768389c7f4e4d6de32629eb34809d828bea874e8b972cb29ac2583b705cf18
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Usage:
|
||||
# ./update-release [runtime-version [--bug bug-id] [--tarball tarball-name] [--larger-rpm-release]
|
||||
# ./update-release [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release]
|
||||
|
||||
set -euo pipefail
|
||||
IFS=$'\n\t'
|
||||
@ -62,37 +62,30 @@ runtime_version=${positional_args[1]:-}
|
||||
sdk_version=""
|
||||
tag=v${runtime_version}
|
||||
if [[ -z ${runtime_version} ]]; then
|
||||
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
|
||||
if [[ -n "${release_json:-}" ]]; then
|
||||
aspnetcore_runtime_version=$(jq -r .aspNetCoreVersion "${release_json}")
|
||||
runtime_version=$(jq -r .runtimeVersion "${release_json}")
|
||||
sdk_version=$(jq -r .sdkVersion "${release_json}")
|
||||
tag=v"${runtime_version}"
|
||||
cp -a "${release_json}" release.json
|
||||
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
|
||||
aspnetcore_runtime_version=$(jq -r .aspNetCoreVersion release.json)
|
||||
runtime_version=$(jq -r .runtimeVersion release.json)
|
||||
sdk_version=$(jq -r .sdkVersion release.json)
|
||||
fi
|
||||
fi
|
||||
|
||||
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||')
|
||||
|
||||
if [[ ${sdk_version:-} = "" ]]; then
|
||||
# FIXME: add preview/rc parts
|
||||
sdk_version=$(echo "${runtime_version}" | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+100 }')
|
||||
fi
|
||||
|
||||
echo "Updating .NET $dotnet_major_minor_version to SDK ${sdk_version} and Runtime ${runtime_version}"
|
||||
|
||||
sed -i -E "s|^%global upstream_tag .*$|%global upstream_tag ${tag}|" "$spec_file"
|
||||
@ -122,16 +115,19 @@ if [[ -f "dotnet-${tag_without_v}.tar.gz" ]]; then
|
||||
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"
|
||||
cp -a "${release_json}" release.json
|
||||
else
|
||||
rm -f release.json
|
||||
spectool -g "$spec_file"
|
||||
if spectool -l "$spec_file" | grep 'bootstrap.tar.gz' ; then
|
||||
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"
|
||||
./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
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user