Skip to content

GitLab

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

import dotnet5.0-5.0.208-2.el8_5

parent 33516d02
Hide whitespace changes
Inline Side-by-side
SOURCES/0001-Add-Rocky-Linux-specific-changes.patch
View file @ b70a0d19
diff -Naurp dotnet-v5.0.208-SDK-orig/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh dotnet-v5.0.208-SDK/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh
--- dotnet-v5.0.208-SDK-orig/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh 2021-10-01 19:10:09.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/diagnostics.47296ca69bb66180c132f3b16667f904dfc7c6c7/eng/init-distro-rid.sh 2021-11-09 21:24:09.611947326 -0700
@@ -51,7 +51,7 @@ initNonPortableDistroRid()
# We have forced __PortableBuild=0. This is because -portablebuld
# has been passed as false.
if (( ${isPortable} == 0 )); then
- if [ "${ID}" == "rhel" ]; then
+ if [ "${ID}" == "rhel" ] || [ "${ID}" == "rocky" ]; then
# remove the last version digit
VERSION_ID=${VERSION_ID%.*}
fi
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.208-SDK/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.208-SDK-orig/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-08-04 08:29:39.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-08-12 10:15:24.807635250 -0700
--- dotnet-v5.0.208-SDK-orig/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-10-01 19:10:09.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-installer.cd07fb054b734018bf72d3bbc44c8e7bafd6e920/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-11-09 21:16:48.652728503 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
OpenSuse = 10,
- FreeBSD = 11
+ FreeBSD = 11,
+ Rocky = 12,
+ Rocky = 12
}
}
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/eng/native/init-distro-rid.sh dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/eng/native/init-distro-rid.sh
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/eng/native/init-distro-rid.sh 2021-10-01 19:09:13.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/eng/native/init-distro-rid.sh 2021-11-09 21:25:55.908276917 -0700
@@ -41,7 +41,7 @@ initNonPortableDistroRid()
# We have forced __PortableBuild=0. This is because -portablebuld
# has been passed as false.
if (( isPortable == 0 )); then
- if [ "${ID}" = "rhel" ]; then
+ if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ]; then
# remove the last version digit
VERSION_ID="${VERSION_ID%.*}"
fi
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props 2021-08-04 08:28:51.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props 2021-08-12 10:18:08.764751358 -0700
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props 2021-10-01 19:09:15.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/installer/Directory.Build.props 2021-11-09 21:18:59.614902511 -0700
@@ -172,6 +172,7 @@
<TargetsOpensuse>false</TargetsOpensuse>
<TargetsFedora>false</TargetsFedora>
......@@ -45,9 +69,9 @@ diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace63
<CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
</PropertyGroup>
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-08-04 08:28:56.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-08-12 10:26:35.614295177 -0700
@@ -4601,6 +4601,122 @@
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-10-01 19:09:21.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-11-09 21:19:53.785560861 -0700
@@ -4808,6 +4808,122 @@
"any",
"base"
],
......@@ -170,7 +194,7 @@ diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace63
"sles": [
"sles",
"linux",
@@ -7032,4 +7148,4 @@
@@ -7239,4 +7355,4 @@
"any",
"base"
]
......@@ -178,8 +202,8 @@ diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace63
\ No newline at end of file
+}
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-08-04 08:28:56.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-08-12 10:25:53.522751516 -0700
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-10-01 19:09:21.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-11-09 21:20:23.297374727 -0700
@@ -50,6 +50,14 @@
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>
......@@ -196,9 +220,9 @@ diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace63
<Parent>linux</Parent>
<Architectures>x64;x86;arm;armel;arm64</Architectures>
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-08-04 08:28:56.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-08-12 10:25:18.274296239 -0700
@@ -1955,6 +1955,63 @@
--- dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-10-01 19:09:21.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-runtime.f431858f8b1f1510723ace6343786c9194dbd7fc/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-11-09 21:20:50.427203615 -0700
@@ -2030,6 +2030,63 @@
"rhel-x64"
]
},
......@@ -262,7 +286,7 @@ diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace63
"sles": {
"#import": [
"linux"
@@ -3121,4 +3178,4 @@
@@ -3196,4 +3253,4 @@
]
}
}
......@@ -270,20 +294,20 @@ diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-runtime.f431858f8b1f1510723ace63
\ No newline at end of file
+}
diff -Naurp dotnet-v5.0.208-SDK-orig/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.208-SDK/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.208-SDK-orig/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-08-04 08:29:23.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-08-12 10:23:13.657686667 -0700
--- dotnet-v5.0.208-SDK-orig/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-10-01 19:09:51.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/dotnet-sdk.25b3161b802eae78d7a306cf404da7af1762e222/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-11-09 21:21:19.532020044 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
OpenSuse = 10,
- FreeBSD = 11
+ FreeBSD = 11,
+ Rocky = 12,
+ Rocky = 12
}
}
diff -Naurp dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json dotnet-v5.0.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
--- dotnet-v5.0.208-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.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-08-12 10:22:44.973316243 -0700
--- dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-10-01 19:09:49.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-11-09 21:21:53.244807413 -0700
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
......@@ -313,8 +337,8 @@ diff -Naurp dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f0
"#import": [ "linux-corert", "debian" ]
},
diff -Naurp dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json dotnet-v5.0.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
--- dotnet-v5.0.208-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.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-08-12 10:21:59.116724394 -0700
--- dotnet-v5.0.208-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-10-01 19:09:49.000000000 -0700
+++ dotnet-v5.0.208-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-11-09 21:22:33.409554095 -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