Update to .NET SDK 9.0.100 and Runtime 9.0.0

Resolves: RHEL-65536
This commit is contained in:
Omair Majid 2024-11-21 10:27:26 -05:00
parent 446d5b6872
commit 86b96b27d7
5 changed files with 44 additions and 28 deletions

2
.gitignore vendored
View File

@ -12,3 +12,5 @@
/dotnet-sdk-9.0.100-rc.1.24452.12-linux-arm64.tar.gz
/dotnet-prebuilts-9.0.100-rc.1.24452.1-ppc64le.tar.gz
/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

View File

@ -10,20 +10,20 @@
# upstream can produce releases with a different tag than the SDK version
#%%global upstream_tag v%%{runtime_version}
%global upstream_tag v9.0.0-rc.2.24473.5
%global upstream_tag v9.0.0
%global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
%global hostfxr_version 9.0.0-rc.2.24473.5
%global runtime_version 9.0.0-rc.2.24473.5
%global aspnetcore_runtime_version 9.0.0-rc.2.24474.3
%global sdk_version 9.0.100-rc.2.24474.1
%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_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 }')
%global runtime_rpm_version 9.0.0~rc.2.24473.5
%global aspnetcore_runtime_rpm_version 9.0.0~rc.2.24474.3
%global sdk_rpm_version 9.0.100~rc.2.24474.1
%global runtime_rpm_version %{runtime_version}
%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version}
%global sdk_rpm_version %{sdk_version}
%global use_bundled_brotli 0
%global use_bundled_libunwind 1
@ -70,7 +70,7 @@
Name: dotnet%{dotnetver}
Version: %{sdk_rpm_version}
Release: 0.7%{?dist}
Release: 1%{?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
* 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
* Mon Oct 28 2024 Omair Majid <omajid@redhat.com> - 9.0.100~rc.2.24474.1-0.7
- Disable bootstrap
- Related: RHEL-62768

View File

@ -1,10 +1,10 @@
{
"release": "9.0.0-rc.2",
"release": "9.0.0",
"channel": "9.0",
"tag": "v9.0.0-rc.2.24473.5",
"sdkVersion": "9.0.100-rc.2.24474.11",
"runtimeVersion": "9.0.0-rc.2.24473.5",
"aspNetCoreVersion": "9.0.0-rc.2.24474.3",
"tag": "v9.0.0",
"sdkVersion": "9.0.100",
"runtimeVersion": "9.0.0",
"aspNetCoreVersion": "9.0.0",
"sourceRepository": "https://github.com/dotnet/dotnet",
"sourceVersion": "b4c156e3f670d86ad737595a912c5c85c481b9ac"
"sourceVersion": "a2bc464e40415d625118f38fbb0556d1803783ff"
}

View File

@ -1,2 +1,2 @@
SHA512 (dotnet-9.0.0-rc.2.24473.5.tar.gz) = 517334ed2bea3cff925ce6e8a04658d792b2f72cea1e9a405686d9d3f786d9b01ce35e8f7edd927bcdc6dbda8fae20267314da771df2d9cafbb4f867182f45ac
SHA512 (dotnet-9.0.0-rc.2.24473.5.tar.gz.sig) = f46d27b0018b028f3612ec32030839305006adb3e7d818e73bd19ade6427a2fd9bf28c78df75f8b4c1eaf9e6454189d6261a5fd28b9f56ef8a04df68c4cc3810
SHA512 (dotnet-9.0.0.tar.gz) = cbfff90ed1abf74c876567952bf22b837c57e433e927d5966e641f5fad96d369a45aff7c26ebcf5f765f374ede991f0059f913d239dfb01a602929ace823bd2f
SHA512 (dotnet-9.0.0.tar.gz.sig) = fe3b63c363d1086c4bafc41dd3f8c7673e9ffa16965e9a8c4104529a204a7e777dc46e187cc866a0e10372b99ddf85f4ba4454f4bedbbf227ede7c2874564d8f

View File

@ -63,22 +63,31 @@ sdk_version=""
tag=v${runtime_version}
if [[ -z ${runtime_version} ]]; then
cat > query <<EOF
[ .[] | select(.name | contains("NET 9.0 ")) ]
[ .[] | 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)
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}"
else
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
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 }')
@ -108,10 +117,11 @@ else
sed -i -E "s|^(%global sdk_rpm_version) .*$|\1 %{sdk_version}|" "$spec_file"
fi
if [[ -f "dotnet-${tag}.tar.gz" ]]; then
echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
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}.tar.gz"
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