Update to .NET 10 Preview 7

Related: RHEL-98678
This commit is contained in:
Omair Majid 2025-08-23 09:30:31 -04:00
parent ea1ebd25a5
commit 043defd243
4 changed files with 48 additions and 28 deletions

6
.gitignore vendored
View File

@ -58,3 +58,9 @@
/dotnet-prebuilts-10.0.100-preview.6.25302.104-x64.tar.gz
/dotnet-prebuilts-10.0.100-preview.6.25358.103-ppc64le.tar.gz
/dotnet-prebuilts-10.0.100-preview.6.25358.103-s390x.tar.gz
/dotnet-10.0.100-preview.7.25380.108.tar.gz
/dotnet-10.0.100-preview.7.25380.108.tar.gz.sig
/dotnet-prebuilts-10.0.100-preview.7.25322.101-arm64.tar.gz
/dotnet-prebuilts-10.0.100-preview.7.25322.101-x64.tar.gz
/dotnet-prebuilts-10.0.100-preview.7.25380.108-ppc64le.tar.gz
/dotnet-prebuilts-10.0.100-preview.7.25380.108-s390x.tar.gz

View File

@ -14,20 +14,20 @@
# upstream can produce releases with a different tag than the SDK version
#%%global upstream_tag v%%{runtime_version}
%global upstream_tag v10.0.0-preview.6.25358.103
%global upstream_tag v10.0.100-preview.7.25380.108
%global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
%global hostfxr_version %{runtime_version}
%global runtime_version 10.0.0-preview.6.25358.103
%global aspnetcore_runtime_version 10.0.0-preview.6.25358.103
%global sdk_version 10.0.100-preview.6.25358.103
%global runtime_version 10.0.0-preview.7.25380.108
%global aspnetcore_runtime_version 10.0.0-preview.7.25380.108
%global sdk_version 10.0.100-preview.7.25380.108
%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 10.0.0~preview.6.25358.103
%global aspnetcore_runtime_rpm_version 10.0.0~preview.6.25358.103
%global sdk_rpm_version 10.0.100~preview.6.25358.103
%global runtime_rpm_version 10.0.0~preview.7.25380.108
%global aspnetcore_runtime_rpm_version 10.0.0~preview.7.25380.108
%global sdk_rpm_version 10.0.100~preview.7.25380.108
%global use_bundled_brotli 0
%global use_bundled_libunwind 1
@ -77,7 +77,7 @@
Name: dotnet%{dotnetver}
Version: %{sdk_rpm_version}
Release: 0.6%{?dist}
Release: 0.7%{?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
@ -89,7 +89,7 @@ Source2: https://dotnet.microsoft.com/download/dotnet/release-key-2023.as
Source3: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json
%if %{with bootstrap}
# The bootstrap SDK version is one listed in the global.json file of the main source archive
%global bootstrap_sdk_version 10.0.100-preview.6.25302.104
%global bootstrap_sdk_version 10.0.100-preview.7.25322.101
# The source is generated on a Fedora box via:
# ./build-dotnet-bootstrap-tarball %%{upstream_tag}
Source10: dotnet-prebuilts-%{bootstrap_sdk_version}-x64.tar.gz
@ -97,7 +97,7 @@ Source11: dotnet-prebuilts-%{bootstrap_sdk_version}-arm64.tar.gz
# To generate ppc64le and s390x archives:
# 1. Build the VMR commit in cross-build mode for the architecture
# 2. Use `build-prebuilt-archive` to create the archive from the VMR
%global bootstrap_sdk_version_ppc64le_s390x 10.0.100-preview.6.25358.103
%global bootstrap_sdk_version_ppc64le_s390x 10.0.100-preview.7.25380.108
Source12: dotnet-prebuilts-%{bootstrap_sdk_version_ppc64le_s390x}-ppc64le.tar.gz
Source13: dotnet-prebuilts-%{bootstrap_sdk_version_ppc64le_s390x}-s390x.tar.gz
%endif
@ -437,7 +437,7 @@ applications using the .NET SDK.
}
%dotnet_targeting_pack dotnet-apphost-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App %{dotnetver} Microsoft.NETCore.App.Host.%{runtime_id}
%dotnet_targeting_pack dotnet-targeting-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App %{dotnetver} Microsoft.NETCore.App.Ref
%dotnet_targeting_pack dotnet-targeting-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App.Ref %{dotnetver} Microsoft.NETCore.App.Ref
%dotnet_targeting_pack aspnetcore-targeting-pack-%{dotnetver} %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App %{dotnetver} Microsoft.AspNetCore.App.Ref
%if %{is_latest_dotnet}
%dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref
@ -601,6 +601,15 @@ CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -march=z13//')
CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -mtune=z14//')
%endif
%if 0%{?rhel} >= 10
# This *seems* to avoid https://github.com/dotnet/runtime/issues/119070
# FIXME: Re-test this, and/or replace with upstream fix
CFLAGS=$(echo $CFLAGS | sed -e 's/-march=x86-64-v3 //')
CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-march=x86-64-v3 //')
LDFLAGS=$(echo $LDFLAGS | sed -e 's/-march=x86-64-v3 //')
%endif
# Enabling fortify-source and "-Wall -Weverything" produces new warnings from libc. Turn them off.
CFLAGS="$CFLAGS -Wno-used-but-marked-unused"
CXXFLAGS="$CXXFLAGS -Wno-used-but-marked-unused"
@ -640,8 +649,10 @@ system_libs=
%ifarch ppc64le s390x
max_attempts=3
timeout=5h
%else
max_attempts=1
max_attempts=3
timeout=90m
%endif
function retry_until_success {
@ -689,7 +700,7 @@ EOF
chmod +x dotnet-rpm-build.sh
VERBOSE=1 retry_until_success $max_attempts \
timeout 5h \
timeout $timeout \
./dotnet-rpm-build.sh
@ -875,8 +886,6 @@ export COMPlus_LTTng=0
%dir %{_libdir}/dotnet/sdk
%dir %{_libdir}/dotnet/sdk-manifests
%{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version}*
# FIXME is using a 8.0.100 version a bug in the SDK?
%{_libdir}/dotnet/sdk-manifests/8.0.100/
%{_libdir}/dotnet/metadata
%ifnarch %{mono_archs}
%{_libdir}/dotnet/library-packs
@ -894,6 +903,7 @@ export COMPlus_LTTng=0
%dir %{_libdir}/dotnet/packs
%dir %{_libdir}/dotnet/packs/runtime.%{runtime_id}.Microsoft.DotNet.ILCompiler/
%{_libdir}/dotnet/packs/runtime.%{runtime_id}.Microsoft.DotNet.ILCompiler/%{runtime_version}*
%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Runtime.NativeAOT.%{runtime_id}/%{runtime_version}*
%endif
%files -n dotnet-sdk-%{dotnetver}-source-built-artifacts
@ -903,6 +913,10 @@ export COMPlus_LTTng=0
%changelog
* Sat Aug 23 2025 Omair Majid <omajid@redhat.com> - 10.0.100~preview.7.25380.108-0.7
- Update to .NET 10 Preview 7
- Related: RHEL-98678
* Tue Aug 19 2025 Omair Majid <omajid@redhat.com> - 10.0.100~preview.6.25358.103-0.6
- Rebuild to try and get rid of random errors
- Related: RHEL-98678

View File

@ -1,11 +1,11 @@
{
"release": "10.0.0-preview.6",
"release": "10.0.0-preview.7",
"channel": "10.0",
"tag": "v10.0.0-preview.6.25358.103",
"sdkVersion": "10.0.100-preview.6.25358.103",
"runtimeVersion": "10.0.0-preview.6.25358.103",
"aspNetCoreVersion": "10.0.0-preview.6.25358.103",
"tag": "v10.0.100-preview.7.25380.108",
"sdkVersion": "10.0.100-preview.7.25380.108",
"runtimeVersion": "10.0.0-preview.7.25380.108",
"aspNetCoreVersion": "10.0.0-preview.7.25380.108",
"sourceRepository": "https://github.com/dotnet/dotnet",
"sourceVersion": "75972a5ba730bdaf7cf3a34f528ab0f5c7f05183",
"officialBuildId": "20250708.3"
"sourceVersion": "30000d883e06c122311a66894579bc12329a09d4",
"officialBuildId": "20250730.8"
}

12
sources
View File

@ -1,6 +1,6 @@
SHA512 (dotnet-10.0.0-preview.6.25358.103.tar.gz) = 46285769f9f11455fae027d2c92fd2ee2754b05b19d174eac319cdee7ff2463dbc0539d42be926cd9cb0852b98dc5d1a42d1193d777edc6b33c480937ef778b7
SHA512 (dotnet-10.0.0-preview.6.25358.103.tar.gz.sig) = 2d60152c308d39cc5e0dc08b5da4264583d6677bb856473aaa2d6649597a120953c8725525b98e4b11cba4712c61cf8cdaa610518e000dfb97162dc6823597c7
SHA512 (dotnet-prebuilts-10.0.100-preview.6.25302.104-arm64.tar.gz) = 55a35072d357c9f1136272f49eca3e0cecc2cfaba4dac22c4e2888e2217ca0897fd80b93e991f926e1355d99273b34696ff708114333506a187809562499f03d
SHA512 (dotnet-prebuilts-10.0.100-preview.6.25302.104-x64.tar.gz) = 2dda7fad60a8485064e65369106eb7d148382f6dcfa53fc8a3640ac4f11367aafb902bff50c7b1fff1ca229519f0f4213428a4abc5389b9b2828b20f148723a3
SHA512 (dotnet-prebuilts-10.0.100-preview.6.25358.103-ppc64le.tar.gz) = bada3d53d554ebaeef569618106e674201ff363c1ed1bd5162fae99ba29e1fbc5ba9f5bcd66d47f74db2f66e629c8d610f3ba00174bf2b7f052c62c698fb1a90
SHA512 (dotnet-prebuilts-10.0.100-preview.6.25358.103-s390x.tar.gz) = 7da45dd6f9d786ee0adcb3e0904d11da89ed46fc6ed19802076326c432def3495837b3aa25ed6b90b9711330f32816b4b5cd21586e4c9a26c933497196098d15
SHA512 (dotnet-10.0.100-preview.7.25380.108.tar.gz) = b184ee69be14d98ed7c1bb4533b80f17f068460768359686c76c158a6751a36d4b2d5650d3cf4d54d300c42850d7e1400ed7ebfce86471742c1782748d2b89ec
SHA512 (dotnet-10.0.100-preview.7.25380.108.tar.gz.sig) = 4bbe073298bcd2e39a01bb8a441d6a0b7072e8d5f2fb341a31999be44218cd5b1cfd748f0372162c1813e651b895afccd04248e6e54c4f397910175233d94645
SHA512 (dotnet-prebuilts-10.0.100-preview.7.25322.101-arm64.tar.gz) = dbdae008f37dc6e9f17442d91c1713ab6bcd8378657135ae34544a569c211c93124e16df04498d508e54c564c9aeee67af7768e45ae305aa8289b7b6650536a9
SHA512 (dotnet-prebuilts-10.0.100-preview.7.25322.101-x64.tar.gz) = 0416ebb4d413352ec0573e50d9be2180f52c0716ed3dce780b741322276ef69a485a8b969fb8ced75b0019587cee4b12972a75c58626997fb146aa8d30dd6048
SHA512 (dotnet-prebuilts-10.0.100-preview.7.25380.108-ppc64le.tar.gz) = 85ba57a93596e2ed0b655b076513f512e5e43004f4cd09c5a5a0579856b2c870a88f26d2ea31017096df6234e5bb51f53c49e6f1ea272cab4dc2011d21fbe68c
SHA512 (dotnet-prebuilts-10.0.100-preview.7.25380.108-s390x.tar.gz) = f297e251c22ee692ba7d02166486bae905b92031e2c0641ab62eace3ac2851fac23f45ba2b26865137346e75363571bf2a22a4b2cc8a81f806e5ef35f03f4f1b