Update to .NET SDK 8.0.100 and Runtime 8.0.0
Resolves: RHEL-15352
This commit is contained in:
Omair Majid
parent
e1588ed8b5
commit
d272f4a0a5
|
|
@ -35,3 +35,4 @@
|
|||
/dotnet-prebuilts-8.0.100-rc.1.23410.12-s390x.tar.gz
|
||||
/dotnet-v8.0.0-rc.1.23419.4.tar.gz
|
||||
/dotnet-v8.0.0-rc.2.23479.6.tar.gz
|
||||
/dotnet-v8.0.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -8,22 +8,22 @@
|
|||
|
||||
%global dotnetver 8.0
|
||||
|
||||
%global host_version 8.0.0-rc.2.23479.6
|
||||
%global runtime_version 8.0.0-rc.2.23479.6
|
||||
%global aspnetcore_runtime_version 8.0.0-rc.2.23480.2
|
||||
%global sdk_version 8.0.100-rc.2.23502.1
|
||||
%global host_version 8.0.0
|
||||
%global runtime_version 8.0.0
|
||||
%global aspnetcore_runtime_version 8.0.0
|
||||
%global sdk_version 8.0.100
|
||||
%global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
|
||||
%global templates_version 8.0.0-rc.2.23480.2
|
||||
%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 version
|
||||
%global upstream_tag v8.0.0-rc.2.23479.6
|
||||
%global upstream_tag v8.0.0
|
||||
%global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
|
||||
|
||||
%global host_rpm_version 8.0.0~rc.2
|
||||
%global runtime_rpm_version 8.0.0~rc.2
|
||||
%global aspnetcore_runtime_rpm_version 8.0.0~rc.2
|
||||
%global sdk_rpm_version 8.0.100~rc.2
|
||||
%global host_rpm_version %{host_version}
|
||||
%global runtime_rpm_version %{runtime_version}
|
||||
%global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version}
|
||||
%global sdk_rpm_version %{sdk_version}
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} < 8
|
||||
%global use_bundled_libunwind 0
|
||||
|
|
@ -48,13 +48,13 @@
|
|||
%global runtime_arch x64
|
||||
%endif
|
||||
|
||||
%global mono_archs s390x ppc64le
|
||||
%global mono_archs ppc64le s390x
|
||||
|
||||
%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID%%.*}")-%{runtime_arch}}
|
||||
|
||||
Name: dotnet%{dotnetver}
|
||||
Version: %{sdk_rpm_version}
|
||||
Release: 0.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
|
||||
|
||||
|
|
@ -90,19 +90,9 @@ Source21: dotnet.sh.in
|
|||
Patch1: roslyn-analyzers-ppc64le-apphost.patch
|
||||
# https://github.com/dotnet/source-build/discussions/3481
|
||||
Patch2: vstest-intent-net8.0.patch
|
||||
# https://github.com/dotnet/runtime/pull/92274
|
||||
Patch3: runtime-92274-webcil-s390x.patch
|
||||
# https://github.com/dotnet/runtime/pull/92920
|
||||
Patch4: runtime-92920-multiple-ssl-dirs.patch
|
||||
# https://github.com/dotnet/source-build/issues/3673
|
||||
Patch5: dotnet-3673-rc2-version-mismatch.patch
|
||||
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
ExclusiveArch: aarch64 ppc64le s390x x86_64
|
||||
%else
|
||||
ExclusiveArch: x86_64
|
||||
%endif
|
||||
|
||||
|
||||
BuildRequires: clang
|
||||
|
|
@ -665,6 +655,10 @@ export COMPlus_LTTng=0
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 15 2023 Omair Majid <omajid@redhat.com> - 8.0.100-3
|
||||
- Update to .NET SDK 8.0.100 and Runtime 8.0.0
|
||||
- Resolves: RHEL-15352
|
||||
|
||||
* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 8.0.100~rc.2-0.1
|
||||
- Update to .NET 8 RC 2
|
||||
- Resolves: RHEL-13790
|
||||
|
|
|
|||
10
release.json
10
release.json
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"release": "8.0.0-rc.2",
|
||||
"release": "8.0.0",
|
||||
"channel": "8.0",
|
||||
"tag": "v8.0.0-rc.2.23479.6",
|
||||
"sdkVersion": "8.0.100-rc.2.23502.2",
|
||||
"runtimeVersion": "8.0.0-rc.2.23479.6",
|
||||
"tag": "v8.0.0",
|
||||
"sdkVersion": "8.0.100",
|
||||
"runtimeVersion": "8.0.0",
|
||||
"sourceRepository": "https://github.com/dotnet/dotnet",
|
||||
"sourceVersion": "1e872358329855089d8d14cec1f06d5b075824b5"
|
||||
"sourceVersion": "40e7f014ff784457efffa58074549735e30772ae"
|
||||
}
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (dotnet-v8.0.0-rc.2.23479.6.tar.gz) = 604220e91cfb3b0909b5127ed6b53b0a661f6258dd87068e5eb2f589729fb7b634ce934967e821075f027e0d2e12d15595a2fff57099efba036f760c6eb79493
|
||||
SHA512 (dotnet-v8.0.0.tar.gz) = 094265462d66d97b51ebfbe5fb06d4a679b97881f1f5a07a87a282a96eeaabfe97ca42061d59aac71dd8861c07f07dda16a72e29ae03167407e51d3fd2767562
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ IFS=$'\n\t'
|
|||
|
||||
print_usage() {
|
||||
echo " Usage:"
|
||||
echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--larger-rpm-release]"
|
||||
echo " ./update-release sdk-version runtime-version [--bug bug-id] [--tarball tarball-name] [--release-json release-json] [--larger-rpm-release]"
|
||||
}
|
||||
|
||||
user_provided_tarball_name=""
|
||||
|
|
@ -28,6 +28,11 @@ while [[ "$#" -gt 0 ]]; do
|
|||
print_usage
|
||||
exit 0
|
||||
;;
|
||||
--release-json)
|
||||
release_json="$2"
|
||||
shift;
|
||||
shift;
|
||||
;;
|
||||
--tarball)
|
||||
user_provided_tarball_name="$2"
|
||||
shift;
|
||||
|
|
@ -61,46 +66,66 @@ fi
|
|||
|
||||
host_version="$runtime_version"
|
||||
|
||||
if [[ "$runtime_version" == "3.1"* ]]; then
|
||||
tag=v${sdk_version}-SDK
|
||||
elif [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]]; then
|
||||
if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then
|
||||
tag=v${sdk_version}
|
||||
else
|
||||
tag=v${runtime_version}
|
||||
fi
|
||||
|
||||
if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then
|
||||
echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball"
|
||||
else
|
||||
if [[ -n "${user_provided_tarball_name}" ]]; then
|
||||
mv "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then
|
||||
mv "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then
|
||||
mv "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then
|
||||
mv "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ ! -f "dotnet-${tag}.tar.gz" ]]; then
|
||||
./build-dotnet-tarball "${tag}"
|
||||
fi
|
||||
|
||||
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"
|
||||
|
||||
|
||||
if [[ "$runtime_version" == "6.0"* ]] || [[ "$runtime_version" == "7.0"* ]] ; then
|
||||
if [[ -f "dotnet-${tag}.tar.gz" ]]; then
|
||||
echo "dotnet-${tag}.tar.gz already exists, not rebuilding tarball"
|
||||
else
|
||||
if [[ -f "dotnet-${tag}-original.tar.gz" ]]; then
|
||||
echo "dotnet-${tag}-original.tar.gz alredy exists, not rebuilding tarball"
|
||||
else
|
||||
if [[ -n "${user_provided_tarball_name}" ]]; then
|
||||
cp -a "$user_provided_tarball_name" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${sdk_version}-SDK.tar.gz" ]]; then
|
||||
cp -a "dotnet-${sdk_version}-SDK.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${sdk_version}.tar.gz" ]]; then
|
||||
cp -a "dotnet-${sdk_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
elif [[ -f "dotnet-${runtime_version}.tar.gz" ]]; then
|
||||
cp -a "dotnet-${runtime_version}.tar.gz" "dotnet-${tag}-original.tar.gz"
|
||||
fi
|
||||
fi
|
||||
|
||||
./build-dotnet-tarball "${tag}"
|
||||
fi
|
||||
else
|
||||
if [[ -f "dotnet-${tag}.tar.gz" ]]; then
|
||||
echo "dotnet-${tag}.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 "${release_json}" release.json
|
||||
else
|
||||
rm release.json
|
||||
spectool -g "$spec_file"
|
||||
fi
|
||||
fi
|
||||
|
||||
set -x
|
||||
|
||||
comment="Update to .NET SDK ${sdk_version} and Runtime ${runtime_version}"
|
||||
commit_message="$comment
|
||||
"
|
||||
for bug_id in "${bug_ids[@]}"; do
|
||||
comment="$comment
|
||||
if [[ "$bug_id" =~ ^[[:digit:]]+$ ]]; then
|
||||
comment="$comment
|
||||
- Resolves: RHBZ#$bug_id"
|
||||
commit_message="$commit_message
|
||||
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
|
||||
|
|
@ -112,7 +137,3 @@ sed -i -E 's|^Release: [[:digit:]]+%|Release: '"$rpm_release"'%|'
|
|||
# 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"
|
||||
|
||||
release_json_url=$(spectool -l --sources ./dotnet8.0.spec | grep release.json | cut -d' ' -f2)
|
||||
rm "$(basename "$release_json_url")"
|
||||
wget "$release_json_url"
|
||||
|
|
|
|||
Loading…
Reference in New Issue