Commit 322884f7 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet5.0-5.0.206-1.el8_4

parent 065ebf24
82bc6f582cbc1d0fa2ffcf6608fadc5e2616a299 SOURCES/dotnet-v5.0.205.2-SDK.tar.gz
957f4ce0a0d13721d85cc51b0392942ff3af6c87 SOURCES/dotnet-v5.0.206-SDK.tar.gz
SOURCES/dotnet-v5.0.205.2-SDK.tar.gz
SOURCES/dotnet-v5.0.206-SDK.tar.gz
diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.205.2-SDK-mod/src/installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.205.2-SDK-orig/src/installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-06-30 09:07:53.000000000 -0700
+++ dotnet-v5.0.205.2-SDK-mod/src/installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-07-16 10:02:57.744798538 -0700
diff -Naurp dotnet-v5.0.206-SDK-orig/src/dotnet-installer.0cf287db1b98af7053f2d0794811ec3a4b4d1fa0/src/core-sdk-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.206-SDK/src/dotnet-installer.0cf287db1b98af7053f2d0794811ec3a4b4d1fa0/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.206-SDK-orig/src/dotnet-installer.0cf287db1b98af7053f2d0794811ec3a4b4d1fa0/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-08-04 08:29:39.000000000 -0700
+++ dotnet-v5.0.206-SDK/src/dotnet-installer.0cf287db1b98af7053f2d0794811ec3a4b4d1fa0/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-08-12 10:15:24.807635250 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
......@@ -10,9 +10,9 @@ diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/installer.64a0cf25eb840995b3a0bf7491e
+ Rocky = 12,
}
}
diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props dotnet-v5.0.205.2-SDK-mod/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props
--- dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props 2021-06-30 09:06:56.000000000 -0700
+++ dotnet-v5.0.205.2-SDK-mod/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props 2021-07-16 10:04:58.230362584 -0700
diff -Naurp dotnet-v5.0.206-SDK-orig/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/installer/Directory.Build.props dotnet-v5.0.206-SDK/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/installer/Directory.Build.props
--- dotnet-v5.0.206-SDK-orig/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/installer/Directory.Build.props 2021-08-04 08:28:51.000000000 -0700
+++ dotnet-v5.0.206-SDK/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/installer/Directory.Build.props 2021-08-12 10:18:08.764751358 -0700
@@ -172,6 +172,7 @@
<TargetsOpensuse>false</TargetsOpensuse>
<TargetsFedora>false</TargetsFedora>
......@@ -44,10 +44,10 @@ diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fc
<CombinedInstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.exe</CombinedInstallerExtension>
<CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
</PropertyGroup>
diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v5.0.205.2-SDK-mod/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-06-30 09:07:02.000000000 -0700
+++ dotnet-v5.0.205.2-SDK-mod/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-07-16 10:07:04.485001518 -0700
@@ -1704,6 +1704,122 @@
diff -Naurp dotnet-v5.0.206-SDK-orig/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v5.0.206-SDK/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v5.0.206-SDK-orig/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-08-04 08:28:56.000000000 -0700
+++ dotnet-v5.0.206-SDK/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-08-12 10:26:35.614295177 -0700
@@ -4601,6 +4601,122 @@
"any",
"base"
],
......@@ -167,8 +167,8 @@ diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fc
+ "any",
+ "base"
+ ],
"debian": [
"debian",
"sles": [
"sles",
"linux",
@@ -7032,4 +7148,4 @@
"any",
......@@ -177,9 +177,9 @@ diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fc
-}
\ No newline at end of file
+}
diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v5.0.205.2-SDK-mod/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-06-30 09:07:02.000000000 -0700
+++ dotnet-v5.0.205.2-SDK-mod/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-07-16 10:08:39.145230331 -0700
diff -Naurp dotnet-v5.0.206-SDK-orig/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v5.0.206-SDK/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v5.0.206-SDK-orig/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-08-04 08:28:56.000000000 -0700
+++ dotnet-v5.0.206-SDK/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-08-12 10:25:53.522751516 -0700
@@ -50,6 +50,14 @@
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>
......@@ -195,11 +195,11 @@ diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fc
<RuntimeGroup Include="debian">
<Parent>linux</Parent>
<Architectures>x64;x86;arm;armel;arm64</Architectures>
diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v5.0.205.2-SDK-mod/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-06-30 09:07:02.000000000 -0700
+++ dotnet-v5.0.205.2-SDK-mod/src/runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-07-16 10:07:28.753316557 -0700
@@ -601,6 +601,63 @@
"rhel.9-x64"
diff -Naurp dotnet-v5.0.206-SDK-orig/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v5.0.206-SDK/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v5.0.206-SDK-orig/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-08-04 08:28:56.000000000 -0700
+++ dotnet-v5.0.206-SDK/src/dotnet-runtime.208e377a5329ad6eb1db5e5fb9d4590fa50beadd/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-08-12 10:25:18.274296239 -0700
@@ -1955,6 +1955,63 @@
"rhel-x64"
]
},
+ "rocky": {
......@@ -259,7 +259,7 @@ diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fc
+ "rhel.9-x64"
+ ]
+ },
"debian": {
"sles": {
"#import": [
"linux"
@@ -3121,4 +3178,4 @@
......@@ -269,9 +269,9 @@ diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/runtime.35964c9215613d66a687ebcb2d7fc
-}
\ No newline at end of file
+}
diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.205.2-SDK-mod/src/sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.205.2-SDK-orig/src/sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-06-30 09:07:35.000000000 -0700
+++ dotnet-v5.0.205.2-SDK-mod/src/sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-07-16 10:03:11.653979093 -0700
diff -Naurp dotnet-v5.0.206-SDK-orig/src/dotnet-sdk.a8e1d9cb37e54f08f58fce93af19378607332973/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.206-SDK/src/dotnet-sdk.a8e1d9cb37e54f08f58fce93af19378607332973/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.206-SDK-orig/src/dotnet-sdk.a8e1d9cb37e54f08f58fce93af19378607332973/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-08-04 08:29:23.000000000 -0700
+++ dotnet-v5.0.206-SDK/src/dotnet-sdk.a8e1d9cb37e54f08f58fce93af19378607332973/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-08-12 10:23:13.657686667 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
......@@ -281,9 +281,9 @@ diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/sdk.845a58cbb84d076bdcc3ea9ae1aff1de8
+ Rocky = 12,
}
}
diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json dotnet-v5.0.205.2-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
--- dotnet-v5.0.205.2-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-06-30 09:07:33.000000000 -0700
+++ dotnet-v5.0.205.2-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-07-16 10:09:36.657976935 -0700
diff -Naurp dotnet-v5.0.206-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json dotnet-v5.0.206-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
--- dotnet-v5.0.206-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-08-04 08:29:21.000000000 -0700
+++ dotnet-v5.0.206-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-08-12 10:22:44.973316243 -0700
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
......@@ -312,9 +312,9 @@ diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35
"debian-corert": {
"#import": [ "linux-corert", "debian" ]
},
diff -Naurp dotnet-v5.0.205.2-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json dotnet-v5.0.205.2-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
--- dotnet-v5.0.205.2-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-06-30 09:07:33.000000000 -0700
+++ dotnet-v5.0.205.2-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-07-16 10:10:24.543598553 -0700
diff -Naurp dotnet-v5.0.206-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json dotnet-v5.0.206-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
--- dotnet-v5.0.206-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-08-04 08:29:21.000000000 -0700
+++ dotnet-v5.0.206-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-08-12 10:21:59.116724394 -0700
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
......
......@@ -20,10 +20,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.8
%global runtime_version 5.0.8
%global host_version 5.0.9
%global runtime_version 5.0.9
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 5.0.205
%global sdk_version 5.0.206
%global templates_version %{runtime_version}
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
......@@ -33,7 +33,7 @@
%global sdk_rpm_version %{sdk_version}
# upstream can update releases without revving the SDK version so these don't always match
%global src_version %{sdk_version}.2
%global src_version %{sdk_version}
%if 0%{?fedora} || 0%{?rhel} < 8
%global use_bundled_libunwind 0
......@@ -56,7 +56,7 @@
Name: dotnet5.0
Version: %{sdk_rpm_version}
Release: 2%{?dist}.rocky.1
Release: 1%{?dist}.rocky.1
Summary: .NET Runtime and SDK
License: MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
URL: https://github.com/dotnet/
......@@ -334,7 +334,7 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages
%endif
# Fix bad hardcoded path in build
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-runtime.*/src/installer/corehost/cli/hostmisc/pal.unix.cpp
# Disable warnings
sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
......@@ -342,11 +342,11 @@ sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
%patch1 -p1
%patch2 -p1
pushd src/runtime.*
pushd src/dotnet-runtime.*
%patch100 -p1
popd
pushd src/sdk.*
pushd src/dotnet-sdk.*
%patch500 -p1
popd
......@@ -454,7 +454,7 @@ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
# dynamic completion needs the file to be named the same as the base command
install src/sdk.*/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
install src/dotnet-sdk.*/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
# TODO: the zsh completion script needs to be ported to use #compdef
#install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
......@@ -531,9 +531,13 @@ echo "Testing build results for debug symbols..."
%changelog
* Thu Jul 29 2021 Release Engineering <releng@rockylinux.org> - 5.0.205-2.rocky.1
* Thu Aug 12 2021 Release Engineering <releng@rockylinux.org> - 5.0.206-1.rocky.1
- Add Rocky Linux specific changes
* Fri Aug 06 2021 Omair Majid <omajid@redhat.com> - 5.0.206-1
- Update to .NET SDK 5.0.206 and Runtime 5.0.9
- Resolves: RHBZ#1990965
* Fri Jul 23 2021 Omair Majid <omajid@redhat.com> - 5.0.205-2
- Update to new upstream release for .NET SDK 5.0.205 and Runtime 5.0.8
- Resolves: RHBZ#1985446
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment