Update to .NET SDK 8.0.100 Preview 3 and Runtime 8.0.0 Preview 3

This commit is contained in:
Omair Majid 2023-04-12 11:48:24 -04:00
parent 0600c351a9
commit e622bf22a4
2 changed files with 19 additions and 23 deletions

View File

@ -119,12 +119,8 @@ if [ -f "${tarball_name}${tarball_suffix}" ]; then
fi fi
if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then
# See https://github.com/dotnet/source-build/issues/3317 wget "https://github.com/dotnet/dotnet/releases/download/${tag}/dotnet-sdk-source-${tag}.tar.gz"
funny_tag=$tag mv "dotnet-sdk-source-${tag}.tar.gz" "${unmodified_tarball_name}.tar.gz"
funny_tag=${funny_tag//100/0}
funny_tag=${funny_tag/v/}
wget "https://github.com/dotnet/dotnet/releases/download/${tag}/dotnet-sdk-source-${funny_tag}.tar.gz"
mv "dotnet-sdk-source-${funny_tag}.tar.gz" "${unmodified_tarball_name}.tar.gz"
#temp_dir=$(mktemp -d -p "$(pwd)" -t temp-build-dotnet-tarball-XXXXXXXXXX) #temp_dir=$(mktemp -d -p "$(pwd)" -t temp-build-dotnet-tarball-XXXXXXXXXX)
#pushd "${temp_dir}" #pushd "${temp_dir}"
@ -180,9 +176,6 @@ fi
# expected location, we need to find the new location of the files and # expected location, we need to find the new location of the files and
# delete them, or verify that upstream has already removed the files. # delete them, or verify that upstream has already removed the files.
# CC-BY-SA https://gitlab.com/fedora/legal/fedora-license-data/-/issues/104#note_1230640823
rm -r src/runtime/src/tests/sizeondisk/sodbench
popd popd
# if [[ ${build_bootstrap} == true ]]; then # if [[ ${build_bootstrap} == true ]]; then

View File

@ -9,20 +9,20 @@
%global dotnetver 8.0 %global dotnetver 8.0
# upstream can update releases without revving the SDK version so these don't always match # upstream can update releases without revving the SDK version so these don't always match
%global upstream_tag v8.0.100-preview.2 %global upstream_tag v8.0.100-preview.3.23178.7
%global host_version 8.0.0-preview.2.23128.3 %global host_version 8.0.0-preview.3.23174.8
%global runtime_version 8.0.0-preview.2.23128.3 %global runtime_version 8.0.0-preview.3.23174.8
%global aspnetcore_runtime_version 8.0.0-preview.2.23153.2 %global aspnetcore_runtime_version 8.0.0-preview.3.23177.8
%global sdk_version 8.0.100-preview.2.23158.1 %global sdk_version 8.0.100-preview.3.23210.1
%global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
%global templates_version 8.0.0-preview.2.23153.2 %global templates_version 8.0.0-preview.3.23177.8
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
%global host_rpm_version 8.0.0~preview.2 %global host_rpm_version 8.0.0~preview.3
%global runtime_rpm_version 8.0.0~preview.2 %global runtime_rpm_version 8.0.0~preview.3
%global aspnetcore_runtime_rpm_version 8.0.0~preview.2 %global aspnetcore_runtime_rpm_version 8.0.0~preview.3
%global sdk_rpm_version 8.0.100~preview.2 %global sdk_rpm_version 8.0.100~preview.3
%if 0%{?fedora} || 0%{?rhel} < 8 %if 0%{?fedora} || 0%{?rhel} < 8
%global use_bundled_libunwind 0 %global use_bundled_libunwind 0
@ -71,10 +71,10 @@ Source1: dotnet-arm64-prebuilts-2023-03-14.tar.gz
# Generated manually, same pattern as the arm64 tarball # Generated manually, same pattern as the arm64 tarball
#Source3: dotnet-s390x-prebuilts-2022-10-12.tar.gz #Source3: dotnet-s390x-prebuilts-2022-10-12.tar.gz
%else %else
%global tarball_name dotnet-%{upstream_tag} # For non-releases, the source is generated on a Fedora box via:
# The source is generated on a Fedora box via: # ./build-dotnet-tarball %%{upstream_tag} or commit
# ./build-dotnet-tarball %%{upstream_tag} %global tarball_name dotnet-sdk-source-%{upstream_tag}
Source0: %{tarball_name}.tar.gz Source0: https://github.com/dotnet/dotnet/releases/download/%{sdk_version}/%{tarball_name}.tar.gz
%endif %endif
#Source10: %%{tarball_name}-nm-dev.tgz #Source10: %%{tarball_name}-nm-dev.tgz
@ -628,6 +628,9 @@ export COMPlus_LTTng=0
%changelog %changelog
* Wed Apr 12 2023 Omair Majid <omajid@redhat.com> - 8.0.100~preview.3-0.1
- Update to .NET SDK 8.0.100 Preview 3 and Runtime 8.0.0 Preview 3
* Wed Mar 15 2023 Omair Majid <omajid@redhat.com> - 8.0.100~preview.2-0.1 * Wed Mar 15 2023 Omair Majid <omajid@redhat.com> - 8.0.100~preview.2-0.1
- Update to .NET SDK 8.0.100 Preview 2 and Runtime 8.0.0 Preview 2 - Update to .NET SDK 8.0.100 Preview 2 and Runtime 8.0.0 Preview 2