diff --git a/1000-dotnet-anolis-add-distro.patch b/1000-dotnet-anolis-add-distro.patch index 344982bc1ae803ac176adffa01fb11c8c8d1d6f3..b657084dfb162392d7e9318bb9b9c5ce8b29ed0e 100644 --- a/1000-dotnet-anolis-add-distro.patch +++ b/1000-dotnet-anolis-add-distro.patch @@ -1,6 +1,6 @@ -diff -Nur dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a723115810b43c9b3a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a723115810b43c9b3a.new/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props ---- dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a723115810b43c9b3a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-03-01 10:27:04.000000000 +0800 -+++ dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a723115810b43c9b3a.new/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-03-11 13:51:34.255987938 +0800 +diff -Nur dotnet-v5.0.213-SDK/src/dotnet-runtime.101667696659492d5cfbc662ffb05f54eb4dbc48/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v5.0.213-SDK/src/dotnet-runtime.101667696659492d5cfbc662ffb05f54eb4dbc48.new/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +--- dotnet-v5.0.213-SDK/src/dotnet-runtime.101667696659492d5cfbc662ffb05f54eb4dbc48/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-03-01 10:27:04.000000000 +0800 ++++ dotnet-v5.0.213-SDK/src/dotnet-runtime.101667696659492d5cfbc662ffb05f54eb4dbc48.new/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2022-03-11 13:51:34.255987938 +0800 @@ -25,6 +25,14 @@ 21;22;23;24;25;26;27;28;29 @@ -24,8 +24,8 @@ diff -Nur dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a72311581 + UpdateRuntimeFiles="true" /> ---- dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a723115810b43c9b3a/eng/native/init-distro-rid.sh 2022-05-17 09:26:01.940587615 +0800 -+++ dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a723115810b43c9b3a/eng/native/init-distro-rid.sh.new 2022-05-17 09:25:10.434811640 +0800 +--- dotnet-v5.0.213-SDK/src/dotnet-runtime.101667696659492d5cfbc662ffb05f54eb4dbc48/eng/native/init-distro-rid.sh 2022-05-17 09:26:01.940587615 +0800 ++++ dotnet-v5.0.213-SDK/src/dotnet-runtime.101667696659492d5cfbc662ffb05f54eb4dbc48/eng/native/init-distro-rid.sh.new 2022-05-17 09:25:10.434811640 +0800 @@ -41,7 +41,7 @@ # We have forced __PortableBuild=0. This is because -portablebuld # has been passed as false. @@ -35,8 +35,8 @@ diff -Nur dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a72311581 # remove the last version digit VERSION_ID="${VERSION_ID%.*}" fi ---- dotnet-v5.0.212-SDK/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh 2022-03-01 10:27:48.000000000 +0800 -+++ dotnet-v5.0.212-SDK/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh.new 2022-05-17 11:28:26.290612114 +0800 +--- dotnet-v5.0.213-SDK/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh 2022-03-01 10:27:48.000000000 +0800 ++++ dotnet-v5.0.213-SDK/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh.new 2022-05-17 11:28:26.290612114 +0800 @@ -51,7 +51,7 @@ # We have forced __PortableBuild=0. This is because -portablebuld # has been passed as false. @@ -46,8 +46,8 @@ diff -Nur dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a72311581 # remove the last version digit VERSION_ID=${VERSION_ID%.*} fi ---- dotnet-v5.0.212-SDK/src/dotnet-sdk.983ff3c3e84516a257537c7f26c3e3d44b08afbe/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs 2022-03-01 10:27:31.000000000 +0800 -+++ dotnet-v5.0.212-SDK/src/dotnet-sdk.983ff3c3e84516a257537c7f26c3e3d44b08afbe/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs.new 2022-05-17 12:21:56.629862215 +0800 +--- dotnet-v5.0.213-SDK/src/dotnet-sdk.983ff3c3e84516a257537c7f26c3e3d44b08afbe/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs 2022-03-01 10:27:31.000000000 +0800 ++++ dotnet-v5.0.213-SDK/src/dotnet-sdk.983ff3c3e84516a257537c7f26c3e3d44b08afbe/src/Cli/Microsoft.DotNet.Cli.Utils/RuntimeEnvironment.cs.new 2022-05-17 12:21:56.629862215 +0800 @@ -211,7 +211,7 @@ lastVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.', lastVersionNumberSeparatorIndex + 1); } @@ -57,8 +57,8 @@ diff -Nur dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a72311581 { distroInfo.VersionId = distroInfo.VersionId.Substring(0, lastVersionNumberSeparatorIndex); } ---- dotnet-v5.0.212-SDK/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.XUnitConsoleRunner/src/common/AssemblyResolution/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2022-03-01 10:26:37.000000000 +0800 -+++ dotnet-v5.0.212-SDK/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.XUnitConsoleRunner/src/common/AssemblyResolution/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs.new 2022-05-17 12:36:21.524546024 +0800 +--- dotnet-v5.0.213-SDK/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.XUnitConsoleRunner/src/common/AssemblyResolution/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2022-03-01 10:26:37.000000000 +0800 ++++ dotnet-v5.0.213-SDK/src/arcade.6eec4404c2df5bfa46e5da52383c881c5cca3a9f/src/Microsoft.DotNet.XUnitConsoleRunner/src/common/AssemblyResolution/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs.new 2022-05-17 12:36:21.524546024 +0800 @@ -131,7 +131,7 @@ // Handle if VersionId is null by just setting the index to -1. int minorVersionNumberSeparatorIndex = distroInfo.VersionId?.IndexOf('.') ?? -1; @@ -68,8 +68,8 @@ diff -Nur dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a72311581 { distroInfo.VersionId = distroInfo.VersionId.Substring(0, minorVersionNumberSeparatorIndex); } ---- dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a723115810b43c9b3a/src/installer/corehost/cli/hostmisc/pal.unix.cpp 2022-05-17 14:17:31.131811793 +0800 -+++ dotnet-v5.0.212-SDK/src/dotnet-runtime.3065735be79d6b7d17e8e3a723115810b43c9b3a/src/installer/corehost/cli/hostmisc/pal.unix.cpp.new 2022-05-17 16:16:25.407854400 +0800 +--- dotnet-v5.0.213-SDK/src/dotnet-runtime.101667696659492d5cfbc662ffb05f54eb4dbc48/src/installer/corehost/cli/hostmisc/pal.unix.cpp 2022-05-17 14:17:31.131811793 +0800 ++++ dotnet-v5.0.213-SDK/src/dotnet-runtime.101667696659492d5cfbc662ffb05f54eb4dbc48/src/installer/corehost/cli/hostmisc/pal.unix.cpp.new 2022-05-17 16:16:25.407854400 +0800 @@ -652,6 +652,7 @@ pal::string_t normalize_linux_rid(pal::string_t rid) { diff --git a/dotnet5.0.spec b/dotnet5.0.spec index 2bbb5104068da419585c9c8dbe31bdf59a823b4c..b8acfce738d47221549b8f6b73e67aa7e64135eb 100644 --- a/dotnet5.0.spec +++ b/dotnet5.0.spec @@ -21,10 +21,10 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 5.0.15 -%global runtime_version 5.0.15 +%global host_version 5.0.16 +%global runtime_version 5.0.16 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 5.0.212 +%global sdk_version 5.0.213 %global templates_version %{runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -189,6 +189,8 @@ Requires: dotnet-hostfxr-5.0%{?_isa} >= %{host_rpm_version}-%{release} # libicu is dlopen()ed Requires: libicu%{?_isa} +# See src/runtime.*/src/libraries/Native/AnyOS/brotli-version.txt +Provides: bundled(brotli) = 1.0.9 %if %{use_bundled_libunwind} Provides: bundled(libunwind) = 1.3 %endif @@ -521,9 +523,13 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0 %changelog -* Fri Mar 11 2022 - 5.0.212-1.0.1 +* Wed May 18 2022 - 5.0.213-1.0.1 - Fix sdk suffix for Anolis OS +* Thu Apr 07 2022 Omair Majid - 5.0.213-1 +- Update to .NET SDK 5.0.213 and Runtime 5.0.16 +- Resolves: RHBZ#2072003 + * Thu Mar 03 2022 Omair Majid - 5.0.212-1 - Update to .NET SDK 5.0.212 and Runtime 5.0.15 - Resolves: RHBZ#2060496 diff --git a/download b/download index 08b726920428d1b5627a74412269757634ac43fd..76db2369b548f7fe367b7dad10732dcfd4cd7dd0 100644 --- a/download +++ b/download @@ -1 +1 @@ -9c5d3fa8dd1b67afd08d67e3384ca6c9 dotnet-v5.0.212-SDK.tar.gz +5fc094eb682b7cab5623d9d2732acfae dotnet-v5.0.213-SDK.tar.gz