diff --git a/.gitignore b/.gitignore index 4a3e928..d3cf97d 100644 --- a/.gitignore +++ b/.gitignore @@ -60,19 +60,3 @@ /dotnet-9.0.3.tar.gz.sig /dotnet-9.0.4.tar.gz /dotnet-9.0.4.tar.gz.sig -/dotnet-9.0.5.tar.gz -/dotnet-9.0.5.tar.gz.sig -/dotnet-9.0.6.tar.gz -/dotnet-9.0.6.tar.gz.sig -/dotnet-9.0.7.tar.gz -/dotnet-9.0.7.tar.gz.sig -/dotnet-9.0.109.tar.gz -/dotnet-9.0.109.tar.gz.sig -/dotnet-9.0.110.tar.gz -/dotnet-9.0.110.tar.gz.sig -/dotnet-9.0.111.tar.gz -/dotnet-9.0.111.tar.gz.sig -/dotnet-9.0.112.tar.gz -/dotnet-9.0.112.tar.gz.sig -/dotnet-9.0.113.tar.gz -/dotnet-9.0.113.tar.gz.sig diff --git a/dotnet9.0.spec b/dotnet9.0.spec index 9f9c914..ff0155a 100644 --- a/dotnet9.0.spec +++ b/dotnet9.0.spec @@ -10,17 +10,17 @@ # Only the package for the latest dotnet version should provide RPMs like # dotnet-host and netstandard-targeting-pack-2.1 -%global is_latest_dotnet 0 +%global is_latest_dotnet 1 # upstream can produce releases with a different tag than the SDK version #%%global upstream_tag v%%{runtime_version} -%global upstream_tag v9.0.113 +%global upstream_tag v9.0.4 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global hostfxr_version %{runtime_version} -%global runtime_version 9.0.12 -%global aspnetcore_runtime_version 9.0.12 -%global sdk_version 9.0.113 +%global runtime_version 9.0.4 +%global aspnetcore_runtime_version 9.0.4 +%global sdk_version 9.0.105 %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 }') @@ -39,6 +39,14 @@ %global use_bundled_rapidjson 1 %endif +%if 0%{?fedora} || 0%{?rhel} < 8 +%global use_bundled_libunwind 0 +%endif + +%ifarch aarch64 ppc64le s390x +%global use_bundled_libunwind 1 +%endif + %ifarch aarch64 %global runtime_arch arm64 %endif @@ -126,8 +134,6 @@ Patch1: runtime-openssl-sha1.patch Patch2: runtime-disable-fortify-on-ilasm-parser.patch # Fix parsing a test project on ppc64le Patch3: roslyn-analyzers-ppc64le-apphost.patch -# https://github.com/dotnet/runtime/issues/119706 -Patch4: runtime-119706-clang-21.patch ExclusiveArch: aarch64 ppc64le s390x x86_64 @@ -136,11 +142,7 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64 %if ! %{use_bundled_brotli} BuildRequires: brotli-devel %endif -%if 0%{?fedora} >= 43 -BuildRequires: clang20 -%else BuildRequires: clang -%endif BuildRequires: cmake BuildRequires: coreutils %if %{without bootstrap} @@ -453,7 +455,9 @@ 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 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 +%endif %package -n dotnet-sdk-%{dotnetver}-source-built-artifacts @@ -777,7 +781,7 @@ test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/ echo "Testing build results for debug symbols..." %{SOURCE20} -v %{buildroot}%{_libdir}/dotnet/ -%if %{is_latest_dotnet} && %{include_macros} +%if %{include_macros} install -dm 0755 %{buildroot}%{_rpmmacrodir}/ install -m 0644 %{SOURCE10} %{buildroot}%{_rpmmacrodir}/ %endif @@ -800,6 +804,8 @@ find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buil rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt rm %{buildroot}%{_libdir}/dotnet/dotnet +# Provided by netstandard-targeting-pack-2.1 from another SRPM +rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %endif @@ -899,36 +905,6 @@ export COMPlus_LTTng=0 %changelog -* Tue Jan 13 2026 Omair Majid - 9.0.113-1 -- Update to .NET SDK 9.0.113 and Runtime 9.0.12 - -* Mon Nov 17 2025 Omair Majid - 9.0.112-1 -- Update to .NET SDK 9.0.112 and Runtime 9.0.11 - -* Wed Oct 29 2025 Omair Majid - 9.0.111-1 -- Update to .NET SDK 9.0.111 and Runtime 9.0.10 - -* Tue Oct 28 2025 Omair Majid - 9.0.110-2 -- Avoid using clang 21 - -* Wed Sep 10 2025 Omair Majid - 9.0.110-1 -- Update to .NET SDK 9.0.110 and Runtime 9.0.9 - -* Wed Aug 06 2025 Omair Majid - 9.0.109-1 -- Update to .NET SDK 9.0.109 and Runtime 9.0.8 - -* Wed Jul 23 2025 Fedora Release Engineering - 9.0.108-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jul 08 2025 Omair Majid - 9.0.108-1 -- Update to .NET SDK 9.0.108 and Runtime 9.0.7 - -* Tue Jun 10 2025 Omair Majid - 9.0.107-1 -- Update to .NET SDK 9.0.107 and Runtime 9.0.6 - -* Tue May 13 2025 Omair Majid - 9.0.106-1 -- Update to .NET SDK 9.0.106 and Runtime 9.0.5 - * Wed Apr 09 2025 Omair Majid - 9.0.105-1 - Update to .NET SDK 9.0.105 and Runtime 9.0.4 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 e37dc66..6eac6bd 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.12", + "release": "9.0.4", "channel": "9.0", - "tag": "v9.0.113", - "sdkVersion": "9.0.113", - "runtimeVersion": "9.0.12", - "aspNetCoreVersion": "9.0.12", + "tag": "v9.0.4", + "sdkVersion": "9.0.105", + "runtimeVersion": "9.0.4", + "aspNetCoreVersion": "9.0.4", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "46e42120674fdd5fe1239797df142f8f6e7943b0" + "sourceVersion": "b7deac6d4239cd0d3375d55c2618054bb2f9df64" } diff --git a/runtime-119706-clang-21.patch b/runtime-119706-clang-21.patch deleted file mode 100644 index a8971d1..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 -@@ -10042,6 +10042,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/sources b/sources index dff85ed..a868222 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dotnet-9.0.113.tar.gz) = f80b02480bd05be9ffcb2322efd7636bef56c432286fb0ab9cb5dfe6803df4a21dfcf9f9640bdf1cb243206e5f7125e4159147c7f22039f1b060f0c790f4e46a -SHA512 (dotnet-9.0.113.tar.gz.sig) = 4144a8b84a2dc72a86d971474015fde2bbcdca179d2658986bb9f6c9dee9d123cd62e950e7ee1743d8682104fd42d8a520e0935de48e643bbb3533783421251b +SHA512 (dotnet-9.0.4.tar.gz) = 5061b1fa37c04c84ceddd544af8f4d917aaaa56b8c6b97a68282654055f7cce8f109d9c36f4c4bbca1c1a8f6251659f906e2915ebb9644bc508ea831e5eeca77 +SHA512 (dotnet-9.0.4.tar.gz.sig) = eb1f79d2f4d74e9c7c37d520b59359eed38c0c62cf2b178b8dea78f44e9c551155841e72fa65f0836c0577439a5e24801c97499549609fb00f6e4088aac26560 diff --git a/tests/ci.fmf b/tests/ci.fmf index 38cdfb1..a7901c4 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: