diff --git a/.gitignore b/.gitignore index 373b232..410d535 100644 --- a/.gitignore +++ b/.gitignore @@ -58,19 +58,3 @@ /dotnet-8.0.14.tar.gz.sig /dotnet-8.0.15.tar.gz /dotnet-8.0.15.tar.gz.sig -/dotnet-8.0.16.tar.gz -/dotnet-8.0.16.tar.gz.sig -/dotnet-8.0.17.tar.gz -/dotnet-8.0.17.tar.gz.sig -/dotnet-8.0.18.tar.gz -/dotnet-8.0.18.tar.gz.sig -/dotnet-8.0.119.tar.gz -/dotnet-8.0.119.tar.gz.sig -/dotnet-8.0.120.tar.gz -/dotnet-8.0.120.tar.gz.sig -/dotnet-8.0.121.tar.gz -/dotnet-8.0.121.tar.gz.sig -/dotnet-8.0.122.tar.gz -/dotnet-8.0.122.tar.gz.sig -/dotnet-8.0.123.tar.gz -/dotnet-8.0.123.tar.gz.sig diff --git a/dotnet8.0.spec b/dotnet8.0.spec index 6cc1b3a..2146211 100644 --- a/dotnet8.0.spec +++ b/dotnet8.0.spec @@ -12,16 +12,16 @@ # dotnet-host and netstandard-targeting-pack-2.1 %global is_latest_dotnet 0 -%global host_version 8.0.23 -%global runtime_version 8.0.23 +%global host_version 8.0.15 +%global runtime_version 8.0.15 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 8.0.123 +%global sdk_version 8.0.115 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') # upstream can produce releases with a different tag than the SDK version -%global upstream_tag v%{sdk_version} +%global upstream_tag v%{runtime_version} %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global host_rpm_version %{host_version} @@ -29,7 +29,15 @@ %global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version} %global sdk_rpm_version %{sdk_version} +%if 0%{?fedora} || 0%{?rhel} < 8 +%global use_bundled_libunwind 0 +%else %global use_bundled_libunwind 1 +%endif + +%ifarch aarch64 ppc64le s390x +%global use_bundled_libunwind 1 +%endif %ifarch aarch64 %global runtime_arch arm64 @@ -93,20 +101,12 @@ Patch4: msbuild-9449-exec-stop-setting-a-locale.patch # digests used for the signature are not treated as fatal errors. # https://issues.redhat.com/browse/RHEL-25254 Patch5: runtime-openssl-sha1.patch -# https://github.com/dotnet/runtime/issues/119706#issuecomment-3292624673 -Patch6: runtime-119706-clang-21.patch -# TODO send upstream -Patch7: runtime-clang-20-support.patch ExclusiveArch: aarch64 ppc64le s390x x86_64 -%if 0%{?fedora} >= 43 -BuildRequires: clang20 -%else BuildRequires: clang -%endif BuildRequires: cmake BuildRequires: coreutils %if %{without bootstrap} @@ -779,36 +779,6 @@ export COMPlus_LTTng=0 %changelog -* Tue Jan 13 2026 Omair Majid - 8.0.123-1 -- Update to .NET SDK 8.0.123 and Runtime 8.0.23 - -* Mon Nov 17 2025 Omair Majid - 8.0.122-1 -- Update to .NET SDK 8.0.122 and Runtime 8.0.22 - -* Thu Oct 30 2025 Omair Majid - 8.0.121-1 -- Update to .NET SDK 8.0.121 and Runtime 8.0.21 - -* Tue Oct 28 2025 Omair Majid - 8.0.120-2 -- Don't use clang 21 - -* Wed Sep 10 2025 Omair Majid - 8.0.120-1 -- Update to .NET SDK 8.0.120 and Runtime 8.0.20 - -* Wed Aug 06 2025 Omair Majid - 8.0.119-1 -- Update to .NET SDK 8.0.119 and Runtime 8.0.19 - -* Wed Jul 23 2025 Fedora Release Engineering - 8.0.118-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jul 08 2025 Omair Majid - 8.0.118-1 -- Update to .NET SDK 8.0.118 and Runtime 8.0.18 - -* Tue Jun 10 2025 Omair Majid - 8.0.117-1 -- Update to .NET SDK 8.0.117 and Runtime 8.0.17 - -* Tue May 13 2025 Omair Majid - 8.0.116-1 -- Update to .NET SDK 8.0.116 and Runtime 8.0.16 - * Wed Apr 09 2025 Omair Majid - 8.0.115-1 - Update to .NET SDK 8.0.115 and Runtime 8.0.15 diff --git a/gating.yaml b/gating.yaml index 6b6a8a9..b7ab3d1 100644 --- a/gating.yaml +++ b/gating.yaml @@ -20,3 +20,4 @@ product_versions: decision_context: osci_compose_gate rules: - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.other-archs.functional} diff --git a/release.json b/release.json index 15390f5..430124b 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.23", + "release": "8.0.15", "channel": "8.0", - "tag": "v8.0.123", - "sdkVersion": "8.0.123", - "runtimeVersion": "8.0.23", - "aspNetCoreVersion": "8.0.23", + "tag": "v8.0.15", + "sdkVersion": "8.0.115", + "runtimeVersion": "8.0.15", + "aspNetCoreVersion": "8.0.15", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "fafff0660ef23ca2ece1444119524a76e0f4d4a4" + "sourceVersion": "4d246579080efa41c77ddfa9ec8e133d7cf52666" } diff --git a/runtime-119706-clang-21.patch b/runtime-119706-clang-21.patch deleted file mode 100644 index 9d97b4a..0000000 --- a/runtime-119706-clang-21.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git dotnet/src/runtime/eng/native/configurecompiler.cmake dotnet/src/runtime/eng/native/configurecompiler.cmake -index d54d9b6803b..9438cb5af7e 100644 ---- dotnet/src/runtime/eng/native/configurecompiler.cmake -+++ dotnet/src/runtime/eng/native/configurecompiler.cmake -@@ -574,6 +574,7 @@ if (CLR_CMAKE_HOST_UNIX OR CLR_CMAKE_HOST_WASI) - add_compile_options(-Wno-unused-function) - add_compile_options(-Wno-tautological-compare) - add_compile_options(-Wno-unknown-pragmas) -+ add_compile_options(-Wno-c++-compat) - - # Explicitly enabled warnings - check_c_compiler_flag(-Wimplicit-fallthrough COMPILER_SUPPORTS_W_IMPLICIT_FALLTHROUGH) -diff --git dotnet/src/runtime/src/coreclr/pal/prebuilt/inc/cordebug.h dotnet/src/runtime/src/coreclr/pal/prebuilt/inc/cordebug.h -index 78b86c69ee9..1672d602d99 100644 ---- dotnet/src/runtime/src/coreclr/pal/prebuilt/inc/cordebug.h -+++ dotnet/src/runtime/src/coreclr/pal/prebuilt/inc/cordebug.h -@@ -10036,6 +10036,7 @@ EXTERN_C const IID IID_ICorDebugRegisterSet2; - typedef - enum CorDebugUserState - { -+ CORDEBUG_INVALID = -1, - USER_STOP_REQUESTED = 0x1, - USER_SUSPEND_REQUESTED = 0x2, - USER_BACKGROUND = 0x4, diff --git a/runtime-clang-20-support.patch b/runtime-clang-20-support.patch deleted file mode 100644 index bffcf79..0000000 --- a/runtime-clang-20-support.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/eng/common/native/init-compiler.sh -+++ b/eng/common/native/init-compiler.sh -@@ -63,7 +63,7 @@ - # Set default versions - if [ -z "$majorVersion" ]; then - # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. -- if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" -+ if [ "$compiler" = "clang" ]; then versions="20 19 18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" - elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi - - for version in $versions; do ---- a/src/runtime/eng/common/native/init-compiler.sh -+++ b/src/runtime/eng/common/native/init-compiler.sh -@@ -63,7 +63,7 @@ - # Set default versions - if [ -z "$majorVersion" ]; then - # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. -- if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" -+ if [ "$compiler" = "clang" ]; then versions="20 19 18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" - elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi - - for version in $versions; do diff --git a/sources b/sources index c823863..4240692 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dotnet-8.0.123.tar.gz) = 650372d872a91945b5b1f45a72a0fad97a068eec66add2278ae2cfe1196ca109e1c5d02eab389a28790b38f7dcee4731c165fade6c93849c4551b0b40055618c -SHA512 (dotnet-8.0.123.tar.gz.sig) = d5e88940fb4768674629b5b8fd321cee0432331da72397b226069320312b69deb9b06663f443fd2509e9a983a8360e64ee6e08d20008c48c77bb9ae35044b318 +SHA512 (dotnet-8.0.15.tar.gz) = 8f4888d7b8433c30d01e22a15289626464c92817259cf914d60c589f15f3a680ae4b19f512ec552e05caa132774aed0b8f17e91a8442be74eabf5e161b145584 +SHA512 (dotnet-8.0.15.tar.gz.sig) = 741fc45ac3a749363aa7c8b9d497d9b65bcd5d2d033fb9b509ea3ec917961141c1d1b0fee84841cf018ad08dfeab1eeb2f953c4bb6130eb2167422206606e275 diff --git a/tests/ci.fmf b/tests/ci.fmf index 44ebb2c..f7e9bee 100644 --- a/tests/ci.fmf +++ b/tests/ci.fmf @@ -1,9 +1,7 @@ summary: Basic smoke test provision: - hardware: - disk: - - size: ">= 20 GiB" - memory: ">= 5120 MiB" + disk: 20 + memory: 5120 prepare: how: install package: