Compare commits

...
Sign in to create a new pull request.

5 commits

Author SHA1 Message Date
Omair Majid
ae4e86a8b7 Update to .NET 10 RC 2
Update to .NET SDK 10.0.100-rc.2.25502.107 and Runtime
10.0.0-rc.2.25502.10.
2025-11-20 08:15:07 -05:00
Yaakov Selkowitz
52e2c059d4 Revert "Revbump for rebootstrap"
This reverts commit 0b45e5517d.
2025-11-20 08:14:48 -05:00
Omair Majid
0825254ffd Disable bootstrap 2025-11-19 15:46:15 -05:00
Yaakov Selkowitz
0b45e5517d Revbump for rebootstrap 2025-11-19 13:11:18 -05:00
Yaakov Selkowitz
65ad2b8947 Build with clang20 in ELN
This will need to be fixed soon, as RHEL 10 will soon also be getting
llvm/clang 21, but in the meantime this lets us build.
2025-11-19 13:07:58 -05:00
5 changed files with 33 additions and 33 deletions

2
.gitignore vendored
View file

@ -58,3 +58,5 @@
/dotnet-prebuilts-10.0.100-rc.1.25420.111-arm64.tar.gz
/dotnet-prebuilts-10.0.100-rc.1.25451.107-ppc64le.tar.gz
/dotnet-prebuilts-10.0.100-rc.1.25451.107-s390x.tar.gz
/dotnet-source-10.0.100-rc.2.25502.107.tar.gz
/dotnet-source-10.0.100-rc.2.25502.107.tar.gz.sig

View file

@ -1,4 +1,4 @@
%bcond_without bootstrap
%bcond_with bootstrap
# LTO triggers a compilation error for a source level issue. Given that LTO should not
# change the validity of any given source and the nature of the error (undefined enum), I
@ -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.100-rc.1.25451.107
%global upstream_tag v10.0.100-rc.2.25502.107
%global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||')
%global hostfxr_version %{runtime_version}
%global runtime_version 10.0.0-rc.1.25451.107
%global aspnetcore_runtime_version 10.0.0-rc.1.25451.107
%global sdk_version 10.0.100-rc.1.25451.107
%global runtime_version 10.0.0-rc.2.25502.107
%global aspnetcore_runtime_version 10.0.0-rc.2.25502.107
%global sdk_version 10.0.100-rc.2.25502.107
%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~rc.1.25451.107
%global aspnetcore_runtime_rpm_version 10.0.0~rc.1.25451.107
%global sdk_rpm_version 10.0.100~rc.1.25451.107
%global runtime_rpm_version 10.0.0~rc.2.25502.107
%global aspnetcore_runtime_rpm_version 10.0.0~rc.2.25502.107
%global sdk_rpm_version 10.0.100~rc.2.25502.107
%global use_bundled_brotli 0
%global use_bundled_libunwind 1
@ -77,14 +77,16 @@
Name: dotnet%{dotnetver}
Version: %{sdk_rpm_version}
Release: 0.8%{?dist}
Release: 0.10%{?dist}
Summary: .NET %{dotnetver} 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
URL: https://github.com/dotnet/
Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%{upstream_tag}.tar.gz#/dotnet-%{upstream_tag_without_v}.tar.gz
Source1: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/dotnet-%{upstream_tag_without_v}.tar.gz.sig
#Source0: https://github.com/dotnet/dotnet/archive/refs/tags/%%{upstream_tag}.tar.gz#/dotnet-%%{upstream_tag_without_v}.tar.gz
#Source1: https://github.com/dotnet/dotnet/releases/download/%%{upstream_tag}/dotnet-%%{upstream_tag_without_v}.tar.gz.sig
Source0: https://builds.dotnet.microsoft.com/dotnet/source-build/dotnet-source-%{upstream_tag_without_v}.tar.gz
Source1: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/dotnet-source-%{upstream_tag_without_v}.tar.gz.sig
Source2: https://dotnet.microsoft.com/download/dotnet/release-key-2023.asc
Source3: https://github.com/dotnet/dotnet/releases/download/%{upstream_tag}/release.json
%if %{with bootstrap}
@ -125,7 +127,7 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64
%if ! %{use_bundled_brotli}
BuildRequires: brotli-devel
%endif
%if 0%{?fedora} >= 43
%if 0%{?fedora} >= 43 || 0%{?rhel} > 10
BuildRequires: clang20
%else
BuildRequires: clang
@ -484,7 +486,7 @@ if [[ ${release_json_tag} != %{upstream_tag} ]]; then
exit 1
fi
%setup -q -n dotnet-%{upstream_tag_without_v}
%setup -q -c -n dotnet-%{upstream_tag_without_v}
# Remove all prebuilts and binaries
rm -rf .dotnet/
@ -829,10 +831,6 @@ rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt
rm %{buildroot}%{_libdir}/dotnet/dotnet
%endif
# Removed by upstream in .NET 10 RC 2
rm -r %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
rmdir %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref
%check
@ -933,6 +931,12 @@ export COMPlus_LTTng=0
%changelog
* Sun Nov 02 2025 Omair Majid <omajid@redhat.com> - 10.0.100~rc.2.25502.107-0.10
- Update to .NET SDK 10.0.100-rc.2.25502.107 and Runtime 10.0.0-rc.2.25502.107
* Thu Oct 30 2025 Omair Majid <omajid@redhat.com> - 10.0.100~rc.1.25451.107-0.9
- Disable bootstrap
* Wed Oct 29 2025 Omair Majid <omajid@redhat.com> - 10.0.100~rc.1.25451.107-0.8
- Don't build with clang 21

View file

@ -1,11 +1,11 @@
{
"release": "10.0.0-rc.1",
"release": "10.0.0-rc.2",
"channel": "10.0",
"tag": "v10.0.100-rc.1.25451.107",
"sdkVersion": "10.0.100-rc.1.25451.107",
"runtimeVersion": "10.0.0-rc.1.25451.107",
"aspNetCoreVersion": "10.0.0-rc.1.25451.107",
"tag": "v10.0.100-rc.2.25502.107",
"sdkVersion": "10.0.100-rc.2.25502.107",
"runtimeVersion": "10.0.0-rc.2.25502.107",
"aspNetCoreVersion": "10.0.0-rc.2.25502.107",
"sourceRepository": "https://github.com/dotnet/dotnet",
"sourceVersion": "2db1f5ee2bdda2e8d873769325fabede32e420e0",
"officialBuildId": "20250901.7"
}
"sourceVersion": "89c8f6a112d37d2ea8b77821e56d170a1bccdc5a",
"officialBuildId": "20251002.7"
}

View file

@ -1,6 +1,2 @@
SHA512 (dotnet-10.0.100-rc.1.25451.107.tar.gz) = 41de62257785dcd6f4d180b62f672b2a1fa599e8a63985ea1b578da340cca32a3905caf8699114ea370799bf3ba033bc6cc8e83e3498da34cf1cf178f7e982f7
SHA512 (dotnet-10.0.100-rc.1.25451.107.tar.gz.sig) = ae8723da5fb35f3c103ec8819d08bb9c21666ed08c4b1bcad97c5ac0c1b7bc60f668a59feac9c0c0ce795905dab281aeabecc6a1a66aa2fd8d9fa8bb8d701133
SHA512 (dotnet-prebuilts-10.0.100-rc.1.25420.111-x64.tar.gz) = 105df63912a12d1bef77004421840cd5fd32658a030ae80557c82dd4dc1b7c9c5a55c0b9c4cf56624adb64e444c9e902cf1a959769f169f18d7281a7357aacb7
SHA512 (dotnet-prebuilts-10.0.100-rc.1.25420.111-arm64.tar.gz) = e53a53728a1200f308125d539efa6b578e33a6e504a5709de4edcfe3d262c00e25fbd25eda535ff356027ccc69dc6314a76fa43b25d96529aee1e5cf5c4acbce
SHA512 (dotnet-prebuilts-10.0.100-rc.1.25451.107-ppc64le.tar.gz) = 3f455b2ebe7d921162b286db98eadfdbe79769655a3419a8c10910ea66baa986e8346cee8c73cb95cf1d150400702d1b12f55c5bdb037c9b94cc81c1e59102e6
SHA512 (dotnet-prebuilts-10.0.100-rc.1.25451.107-s390x.tar.gz) = ee3fdf8d01d11a682ac04603794fbe90ae9d489506139909f20b70bf2a026ef0e4e293c6c42cea85491849239f4ed47c426fdb40248adcafea13b001b284a44e
SHA512 (dotnet-source-10.0.100-rc.2.25502.107.tar.gz) = eefa03f6e409274c3d5a29317c6e26badb991019bc9c8faa2172b7ead937032bf8829474da4dc5badfb92d33e2140c6d0121f8f996c8ec146f9efddc9b2770ca
SHA512 (dotnet-source-10.0.100-rc.2.25502.107.tar.gz.sig) = 4dec13df46b91f641630623778cd2509a0bb68b47975735f1e623a445f02648268f19dae7b4b1912ab855d099f35afd78506808f667d67d2774ef594a3af8191

View file

@ -216,5 +216,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"
./check-bundled-versions