From 0600c351a918ffc79913c6199b16d0b22700f3b1 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Wed, 15 Mar 2023 10:41:40 -0400 Subject: [PATCH] Update to .NET SDK 8.0.100 Preview 2 and Runtime 8.0.0 Preview 2 --- build-arm64-bootstrap-tarball | 7 ++--- build-dotnet-tarball | 51 +++++++++++++++-------------------- dotnet8.0.spec | 29 +++++++++++--------- 3 files changed, 42 insertions(+), 45 deletions(-) diff --git a/build-arm64-bootstrap-tarball b/build-arm64-bootstrap-tarball index a446d03..2092af4 100755 --- a/build-arm64-bootstrap-tarball +++ b/build-arm64-bootstrap-tarball @@ -30,9 +30,10 @@ pushd "dotnet-arm64-prebuilts-$date" # Binaries can be at one of several different URLs: # GA releases: -#wget https://dotnetcli.azureedge.net/dotnet/Sdk/$version/dotnet-sdk-$version-linux-arm64.tar.gz -# Preview releases: -wget https://dotnetbuilds.azureedge.net/public/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: + 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 mapfile -t linux_x64_packages < <(tar tf "$archive" | grep linux-x64) diff --git a/build-dotnet-tarball b/build-dotnet-tarball index 9f70d6a..30d9e05 100755 --- a/build-dotnet-tarball +++ b/build-dotnet-tarball @@ -119,21 +119,29 @@ if [ -f "${tarball_name}${tarball_suffix}" ]; then fi if [ ! -f "${unmodified_tarball_name}.tar.gz" ]; then - temp_dir=$(mktemp -d -p "$(pwd)" -t temp-build-dotnet-tarball-XXXXXXXXXX) - pushd "${temp_dir}" - mkdir dotnet - pushd dotnet - git init - 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 + # See https://github.com/dotnet/source-build/issues/3317 + funny_tag=$tag + 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) + #pushd "${temp_dir}" + #mkdir dotnet + #pushd dotnet + #git init + #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 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 # 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 rm -r src/runtime/src/tests/sizeondisk/sodbench diff --git a/dotnet8.0.spec b/dotnet8.0.spec index 5476228..efcf39f 100644 --- a/dotnet8.0.spec +++ b/dotnet8.0.spec @@ -8,21 +8,21 @@ %global dotnetver 8.0 -%global host_version 8.0.0-preview.1.23110.8 -%global runtime_version 8.0.0-preview.1.23110.8 -%global aspnetcore_runtime_version 8.0.0-preview.1.23112.2 -%global sdk_version 8.0.100-preview.1.23115.1 +# upstream can update releases without revving the SDK version so these don't always match +%global upstream_tag v8.0.100-preview.2 + +%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 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 host_rpm_version 8.0.0~preview.1 -%global runtime_rpm_version 8.0.0~preview.1 -%global aspnetcore_runtime_rpm_version 8.0.0~preview.1 -%global sdk_rpm_version 8.0.100~preview.1 - -# upstream can update releases without revving the SDK version so these don't always match -%global upstream_tag v8.0.100-preview.1 +%global host_rpm_version 8.0.0~preview.2 +%global runtime_rpm_version 8.0.0~preview.2 +%global aspnetcore_runtime_rpm_version 8.0.0~preview.2 +%global sdk_rpm_version 8.0.100~preview.2 %if 0%{?fedora} || 0%{?rhel} < 8 %global use_bundled_libunwind 0 @@ -65,7 +65,7 @@ URL: https://github.com/dotnet/ # ./build-dotnet-tarball --bootstrap %%{upstream_tag} Source0: %{tarball_name}.tar.xz # 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 #Source2: dotnet-ppc64le-prebuilts-2022-10-21.tar.gz # Generated manually, same pattern as the arm64 tarball @@ -628,6 +628,9 @@ export COMPlus_LTTng=0 %changelog +* Wed Mar 15 2023 Omair Majid - 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 - 8.0.100~preview.1-0.1 - Update to .NET SDK 8.0.100 Preview 1 and Runtime 8.0.0 Preview 1