Commit d25c9f32 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet5.0-5.0.205-1.el8_4

parent adefc93c
ff7868c64b73af945d0d6d53b482f41b26886850 SOURCES/dotnet-v5.0.204-SDK.tar.gz
67aeddf92407bc57d9b3398274b2cfe340446e04 SOURCES/dotnet-v5.0.205-SDK.tar.gz
SOURCES/dotnet-v5.0.204-SDK.tar.gz
SOURCES/dotnet-v5.0.205-SDK.tar.gz
......@@ -14,10 +14,10 @@ Subject: [PATCH] Add Rocky Linux specific changes
.../compiler/resources/runtime.json | 14 +++
8 files changed, 222 insertions(+), 3 deletions(-)
diff --git a/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
diff --git a/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
index 72e68a0dc..d861d57b7 100644
--- a/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
--- a/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
@@ -15,6 +15,7 @@ public enum BuildPlatform
Debian = 8,
Fedora = 9,
......@@ -27,10 +27,10 @@ index 72e68a0dc..d861d57b7 100644
+ Rocky = 12,
}
}
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props
diff --git a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props
index 9c82b3bc2..7197feafd 100644
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props
--- a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props
+++ b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props
@@ -172,6 +172,7 @@
<TargetsOpensuse>false</TargetsOpensuse>
<TargetsFedora>false</TargetsFedora>
......@@ -62,10 +62,10 @@ index 9c82b3bc2..7197feafd 100644
<CombinedInstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.exe</CombinedInstallerExtension>
<CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
</PropertyGroup>
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
diff --git a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index f56d7461e..fbca5ca1c 100644
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -1704,6 +1704,122 @@
"any",
"base"
......@@ -189,10 +189,10 @@ index f56d7461e..fbca5ca1c 100644
"debian": [
"debian",
"linux",
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
diff --git a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
index 3e8b2e74e..953760a29 100644
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
--- a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -601,6 +601,63 @@
"rhel.9-x64"
]
......@@ -257,10 +257,10 @@ index 3e8b2e74e..953760a29 100644
"debian": {
"#import": [
"linux"
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
diff --git a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index e78268c07..33afd7f79 100644
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -49,6 +49,14 @@
<ApplyVersionsToParent>true</ApplyVersionsToParent>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
......@@ -276,10 +276,10 @@ index e78268c07..33afd7f79 100644
<RuntimeGroup Include="debian">
<Parent>linux</Parent>
diff --git a/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
diff --git a/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
index 72e68a0dc..d861d57b7 100644
--- a/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
--- a/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
@@ -15,6 +15,7 @@ public enum BuildPlatform
Debian = 8,
Fedora = 9,
......
--- a/patches/runtime/0036-Add-net46-for-some-packages-to-support-Omnisharp.patch
+++ b/patches/runtime/0036-Add-net46-for-some-packages-to-support-Omnisharp.patch
@@ -58,25 +58,3 @@
<DefineConstants>$(DefineConstants);RESOURCES_EXTENSIONS</DefineConstants>
<Nullable>enable</Nullable>
</PropertyGroup>
-diff --git a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
-index b48848c7a45..b310496f4bc 100644
---- a/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
-+++ b/src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
-@@ -1,6 +1,6 @@
- <Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
-- <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461</TargetFrameworks>
-+ <TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;net461;net46</TargetFrameworks>
- <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
- </PropertyGroup>
- <ItemGroup>
-@@ -44,4 +44,4 @@
- </ItemGroup>
- <Exec Command="%(ExecuteMethod.Command)" WorkingDirectory="$(TargetDir)" />
- </Target>
--</Project>
-\ No newline at end of file
-+</Project>
---
-2.18.0
-
......@@ -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.7
%global runtime_version 5.0.7
%global host_version 5.0.8
%global runtime_version 5.0.8
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 5.0.204
%global sdk_version 5.0.205
%global templates_version %{runtime_version}
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
......@@ -68,6 +68,7 @@ Source1: check-debug-symbols.py
Source2: dotnet.sh.in
Patch1: source-build-runtime-fixup-linker-order.patch
Patch2: source-build-remove-test-references-from-patches.patch
# https://github.com/dotnet/runtime/pull/42094
# Fix linker order when linking with --as-needed
......@@ -339,6 +340,7 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-runtime.*/src/install
sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
%patch1 -p1
%patch2 -p1
pushd src/dotnet-runtime.*
%patch100 -p1
......@@ -529,9 +531,14 @@ echo "Testing build results for debug symbols..."
%changelog
* Mon Jun 14 2021 Mustafa Gezen <mustafa@rockylinux.org> - 5.0.204-1.rocky
* Thu Jul 15 2021 Mustafa Gezen <mustafa@rockylinux.org> - 5.0.205-1.rocky
- Add Rocky Linux specific changes
* Thu Jul 08 2021 Andrew Slice <andrew.slice@redhat.com> - 5.0.205-1
- Update to .NET SDK 5.0.205 and Runtime 5.0.8
- Added a patch to remove references to the tests directory from other patches.
- Resolves: RHBZ#1980412
* Mon May 31 2021 Omair Majid <omajid@redhat.com> - 5.0.204-1
- Update to .NET SDK 5.0.204 and Runtime 5.0.7
- Resolves: RHBZ#1966166
......
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