Skip to content

GitLab

Commit 065ebf24 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet5.0-5.0.205-2.el8_4

parent f8e078bc
Hide whitespace changes
Inline Side-by-side
SOURCES/0001-Add-Rocky-Linux-specific-changes.patch
View file @ 065ebf24
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.205-SDK-mod/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.205-SDK-orig/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-06-30 09:07:53.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-07-16 10:02:57.744798538 -0700
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
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
......@@ -10,9 +10,9 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-installer.64a0cf25eb840995b3a0bf
+ Rocky = 12,
}
}
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props
--- dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props 2021-06-30 09:06:56.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props 2021-07-16 10:04:58.230362584 -0700
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
@@ -172,6 +172,7 @@
<TargetsOpensuse>false</TargetsOpensuse>
<TargetsFedora>false</TargetsFedora>
......@@ -44,9 +44,9 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb
<CombinedInstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.exe</CombinedInstallerExtension>
<CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
</PropertyGroup>
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-06-30 09:07:02.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-07-16 10:07:04.485001518 -0700
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 @@
"any",
"base"
......@@ -177,9 +177,9 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb
-}
\ No newline at end of file
+}
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-06-30 09:07:02.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-07-16 10:08:39.145230331 -0700
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
@@ -50,6 +50,14 @@
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>
......@@ -195,9 +195,9 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb
<RuntimeGroup Include="debian">
<Parent>linux</Parent>
<Architectures>x64;x86;arm;armel;arm64</Architectures>
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-06-30 09:07:02.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-07-16 10:07:28.753316557 -0700
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"
]
......@@ -269,9 +269,9 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb
-}
\ No newline at end of file
+}
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.205-SDK-mod/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.205-SDK-orig/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-06-30 09:07:35.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-07-16 10:03:11.653979093 -0700
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
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
......@@ -281,9 +281,9 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1af
+ Rocky = 12,
}
}
diff -Naurp dotnet-v5.0.205-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json dotnet-v5.0.205-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
--- dotnet-v5.0.205-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-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.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
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
......@@ -312,9 +312,9 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f0
"debian-corert": {
"#import": [ "linux-corert", "debian" ]
},
diff -Naurp dotnet-v5.0.205-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json dotnet-v5.0.205-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
--- dotnet-v5.0.205-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-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.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
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
......
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