diff --git a/.gitignore b/.gitignore index b7d7559..305f4fd 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ /dotnet-8.0.8.tar.gz.sig /dotnet-8.0.10.tar.gz /dotnet-8.0.10.tar.gz.sig +/dotnet-8.0.11.tar.gz +/dotnet-8.0.11.tar.gz.sig diff --git a/dotnet8.0.spec b/dotnet8.0.spec index 2612d59..ca8a38d 100644 --- a/dotnet8.0.spec +++ b/dotnet8.0.spec @@ -8,10 +8,14 @@ %global dotnetver 8.0 -%global host_version 8.0.10 -%global runtime_version 8.0.10 +# 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 host_version 8.0.11 +%global runtime_version 8.0.11 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 8.0.110 +%global sdk_version 8.0.111 %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 }') @@ -386,7 +390,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 @@ -528,7 +534,8 @@ export EXTRA_LDFLAGS="$LDFLAGS" # suggested compile-time change doesn't work, unfortunately. export COMPlus_LTTng=0 -VERBOSE=1 ./build.sh \ +VERBOSE=1 timeout 5h \ + ./build.sh \ %if %{without bootstrap_dotnet} --with-sdk previously-built-dotnet \ %endif @@ -592,6 +599,7 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \; +%if %{is_latest_dotnet} install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ @@ -616,6 +624,7 @@ echo "%{_libdir}/dotnet" >> install_location install install_location %{buildroot}%{_sysconfdir}/dotnet/ echo "%{_libdir}/dotnet" >> install_location_%{runtime_arch} install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/ +%endif install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ @@ -639,6 +648,20 @@ find %{buildroot}%{_libdir}/dotnet/sdk -type d | tail -n +2 | sed -E 's|%{buildr find %{buildroot}%{_libdir}/dotnet/sdk -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' >> dotnet-sdk-non-dbg-files find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-sdk-dbg-files +%if %{is_latest_dotnet} == 0 +# If this is an older version, self-test now, before we delete files. After we +# delete files, we will not have everything we need to self-test in %%check. +%{buildroot}%{_libdir}/dotnet/dotnet --info +%{buildroot}%{_libdir}/dotnet/dotnet --version + +# Provided by dotnet-host from another SRPM +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 + %check %if 0%{?fedora} > 35 @@ -646,10 +669,13 @@ find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buil export COMPlus_LTTng=0 %endif +%if %{is_latest_dotnet} %{buildroot}%{_libdir}/dotnet/dotnet --info %{buildroot}%{_libdir}/dotnet/dotnet --version +%endif +%if %{is_latest_dotnet} %if ( 0%{?fedora} && 0%{?fedora} < 38 ) || ( 0%{?rhel} && 0%{?rhel} < 9 ) %files -n dotnet # empty package useful for dependencies @@ -670,6 +696,7 @@ export COMPlus_LTTng=0 %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/dotnet +%endif %files -n dotnet-hostfxr-%{dotnetver} %dir %{_libdir}/dotnet/host/fxr @@ -712,6 +739,10 @@ export COMPlus_LTTng=0 %changelog +* Thu Nov 14 2024 Omair Majid - 8.0.111-2 +- Update to .NET SDK 8.0.111 and Runtime 8.0.11 +- Resolves: RHEL-65366 + * Tue Oct 15 2024 Omair Majid - 8.0.110-2 - Update to .NET SDK 8.0.110 and Runtime 8.0.10 - Resolves: RHEL-60794 diff --git a/release.json b/release.json index 501d01c..6c2c717 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.10", + "release": "8.0.11", "channel": "8.0", - "tag": "v8.0.10", - "sdkVersion": "8.0.110", - "runtimeVersion": "8.0.10", - "aspNetCoreVersion": "8.0.10", + "tag": "v8.0.11", + "sdkVersion": "8.0.111", + "runtimeVersion": "8.0.11", + "aspNetCoreVersion": "8.0.11", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "8922fe64a1903ed4e35e24568efb056b3e0fad43" + "sourceVersion": "d5f3d652f9266d600777f626a9650a273419859b" } diff --git a/sources b/sources index bfeb2e9..f54baad 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dotnet-8.0.10.tar.gz) = 5bb660d4bf750392d4022ceb02a7f76a04a8f789c9fbbde329019bc3e097fd7296984b52d29dfc027d31b7b4defdf3807f10e37a9696f8f0026c77cea6ad0d18 -SHA512 (dotnet-8.0.10.tar.gz.sig) = 3c4ea982659f00d84528ac26493712d9f786d588797649bb4f551d8e5f7a0aca51a6e27dbe71b1979eeb3307acbac7306da83c14782bb944dd4510ea7761f8d8 +SHA512 (dotnet-8.0.11.tar.gz) = 1bd689e560114d3cbe6a40d6608b0f5f493bef5e4d74f973c37d2e4bf88f999c769c12c390300f1d51094252a5791930c65547e1e4b8fa33387f995d296687f9 +SHA512 (dotnet-8.0.11.tar.gz.sig) = 7faef7d2fc9728117425c489bc78014ac4017394946cfbb3699817e06ff1d18ada022bfcd1c5dd2898fdc41bc2b9ff3645b83e18f2d3653e3ae9008f0b296f8a diff --git a/tests/ci.fmf b/tests/ci.fmf index 1ebdb28..9487ea3 100644 --- a/tests/ci.fmf +++ b/tests/ci.fmf @@ -20,7 +20,6 @@ prepare: - libstdc++-devel - lldb - lttng-ust - - npm - postgresql-odbc - postgresql-server - procps-ng