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

This commit is contained in:
Omair Majid 2023-03-15 10:41:40 -04:00
parent 51446e8906
commit 0600c351a9
3 changed files with 42 additions and 45 deletions

View File

@ -30,9 +30,10 @@ pushd "dotnet-arm64-prebuilts-$date"
# Binaries can be at one of several different URLs: # Binaries can be at one of several different URLs:
# GA releases: # GA releases:
#wget https://dotnetcli.azureedge.net/dotnet/Sdk/$version/dotnet-sdk-$version-linux-arm64.tar.gz if ! wget https://dotnetcli.azureedge.net/dotnet/Sdk/$version/dotnet-sdk-$version-linux-arm64.tar.gz; then
# Preview releases: # Preview releases:
wget https://dotnetbuilds.azureedge.net/public/Sdk/$version/dotnet-sdk-$version-linux-arm64.tar.gz wget https://dotnetbuilds.azureedge.net/public/Sdk/$version/dotnet-sdk-$version-linux-arm64.tar.gz
fi
for archive in "$bootstrap_dir"/prereqs/packages/archive/*.tar.gz; do for archive in "$bootstrap_dir"/prereqs/packages/archive/*.tar.gz; do
mapfile -t linux_x64_packages < <(tar tf "$archive" | grep linux-x64) mapfile -t linux_x64_packages < <(tar tf "$archive" | grep linux-x64)

View File

@ -119,21 +119,29 @@ 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
temp_dir=$(mktemp -d -p "$(pwd)" -t temp-build-dotnet-tarball-XXXXXXXXXX) # See https://github.com/dotnet/source-build/issues/3317
pushd "${temp_dir}" funny_tag=$tag
mkdir dotnet funny_tag=${funny_tag//100/0}
pushd dotnet funny_tag=${funny_tag/v/}
git init wget "https://github.com/dotnet/dotnet/releases/download/${tag}/dotnet-sdk-source-${funny_tag}.tar.gz"
git remote add origin https://github.com/dotnet/dotnet mv "dotnet-sdk-source-${funny_tag}.tar.gz" "${unmodified_tarball_name}.tar.gz"
git fetch --depth 1 origin "${tag}"
git checkout FETCH_HEAD #temp_dir=$(mktemp -d -p "$(pwd)" -t temp-build-dotnet-tarball-XXXXXXXXXX)
git submodule update --init --recursive #pushd "${temp_dir}"
clean_dotnet_cache #mkdir dotnet
./eng/pack-sources.sh -o "$(readlink -f ../../"${unmodified_tarball_name}.tar.gz")" #pushd dotnet
popd #git init
popd #git remote add origin https://github.com/dotnet/dotnet
#git fetch --depth 1 origin "${tag}"
#git checkout FETCH_HEAD
#git submodule update --init --recursive
#clean_dotnet_cache
#./eng/pack-sources.sh -o "$(readlink -f ../../"${unmodified_tarball_name}.tar.gz")"
#popd
#popd
#rm -rf "${temp_dir}"
rm -rf "${temp_dir}"
fi fi
tar tf "${unmodified_tarball_name}".tar.gz > .tarball_file_list tar tf "${unmodified_tarball_name}".tar.gz > .tarball_file_list
@ -172,21 +180,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.
# Binaries for gradle
rm -r src/aspnetcore/src/SignalR/clients/java/signalr/gradle*
# https://github.com/dotnet/aspnetcore/issues/34785
find src/aspnetcore/src -type d -name samples -print0 | xargs -0 rm -r
# Unnecessary crypto implementation: IDEA
rm -r src/runtime/src/tests/JIT/Performance/CodeQuality/Bytemark/
# https://github.com/NuGet/Home/issues/11094
rm -r src/nuget-client/test/EndToEnd
# https://github.com/microsoft/ApplicationInsights-dotnet/issues/2670
rm -r src/source-build-externals/src/application-insights/LOGGING/test/Shared/CustomTelemetryChannel.cs
# CC-BY-SA https://gitlab.com/fedora/legal/fedora-license-data/-/issues/104#note_1230640823 # CC-BY-SA https://gitlab.com/fedora/legal/fedora-license-data/-/issues/104#note_1230640823
rm -r src/runtime/src/tests/sizeondisk/sodbench rm -r src/runtime/src/tests/sizeondisk/sodbench

View File

@ -8,21 +8,21 @@
%global dotnetver 8.0 %global dotnetver 8.0
%global host_version 8.0.0-preview.1.23110.8 # upstream can update releases without revving the SDK version so these don't always match
%global runtime_version 8.0.0-preview.1.23110.8 %global upstream_tag v8.0.100-preview.2
%global aspnetcore_runtime_version 8.0.0-preview.1.23112.2
%global sdk_version 8.0.100-preview.1.23115.1 %global host_version 8.0.0-preview.2.23128.3
%global runtime_version 8.0.0-preview.2.23128.3
%global aspnetcore_runtime_version 8.0.0-preview.2.23153.2
%global sdk_version 8.0.100-preview.2.23158.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.1.23112.2 %global templates_version 8.0.0-preview.2.23153.2
#%%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.1 %global host_rpm_version 8.0.0~preview.2
%global runtime_rpm_version 8.0.0~preview.1 %global runtime_rpm_version 8.0.0~preview.2
%global aspnetcore_runtime_rpm_version 8.0.0~preview.1 %global aspnetcore_runtime_rpm_version 8.0.0~preview.2
%global sdk_rpm_version 8.0.100~preview.1 %global sdk_rpm_version 8.0.100~preview.2
# upstream can update releases without revving the SDK version so these don't always match
%global upstream_tag v8.0.100-preview.1
%if 0%{?fedora} || 0%{?rhel} < 8 %if 0%{?fedora} || 0%{?rhel} < 8
%global use_bundled_libunwind 0 %global use_bundled_libunwind 0
@ -65,7 +65,7 @@ URL: https://github.com/dotnet/
# ./build-dotnet-tarball --bootstrap %%{upstream_tag} # ./build-dotnet-tarball --bootstrap %%{upstream_tag}
Source0: %{tarball_name}.tar.xz Source0: %{tarball_name}.tar.xz
# Generated via ./build-arm64-bootstrap-tarball # Generated via ./build-arm64-bootstrap-tarball
Source1: dotnet-arm64-prebuilts-2023-02-21.tar.gz 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
#Source2: dotnet-ppc64le-prebuilts-2022-10-21.tar.gz #Source2: dotnet-ppc64le-prebuilts-2022-10-21.tar.gz
# Generated manually, same pattern as the arm64 tarball # Generated manually, same pattern as the arm64 tarball
@ -628,6 +628,9 @@ export COMPlus_LTTng=0
%changelog %changelog
* 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
* Wed Feb 22 2023 Omair Majid <omajid@redhat.com> - 8.0.100~preview.1-0.1 * Wed Feb 22 2023 Omair Majid <omajid@redhat.com> - 8.0.100~preview.1-0.1
- Update to .NET SDK 8.0.100 Preview 1 and Runtime 8.0.0 Preview 1 - Update to .NET SDK 8.0.100 Preview 1 and Runtime 8.0.0 Preview 1