Commit 46b5bdd5 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet3.1-3.1.116-1.el8_4

parent e0afef2f
diff -ur dotnet-v3.1.115-SDK-orig/src/coreclr.803ce08ee96925f9d08021c9c6b96af8f27d16c4/init-distro-rid.sh dotnet-v3.1.115-SDK-mod/src/coreclr.803ce08ee96925f9d08021c9c6b96af8f27d16c4/init-distro-rid.sh diff -ur dotnet-v3.1.115-SDK-orig/src/coreclr.b820e148c5ded6a37cb3ddb38b88b54210189562/init-distro-rid.sh dotnet-v3.1.115-SDK-mod/src/coreclr.b820e148c5ded6a37cb3ddb38b88b54210189562/init-distro-rid.sh
--- dotnet-v3.1.115-SDK-orig/src/coreclr.803ce08ee96925f9d08021c9c6b96af8f27d16c4/init-distro-rid.sh 2021-04-26 09:21:28.000000000 -0500 --- dotnet-v3.1.115-SDK-orig/src/coreclr.b820e148c5ded6a37cb3ddb38b88b54210189562/init-distro-rid.sh 2021-04-26 09:21:28.000000000 -0500
+++ dotnet-v3.1.115-SDK-mod/src/coreclr.803ce08ee96925f9d08021c9c6b96af8f27d16c4/init-distro-rid.sh 2021-05-31 12:53:58.786514309 -0500 +++ dotnet-v3.1.115-SDK-mod/src/coreclr.b820e148c5ded6a37cb3ddb38b88b54210189562/init-distro-rid.sh 2021-05-31 12:53:58.786514309 -0500
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
# We have forced __PortableBuild=0. This is because -portablebuld # We have forced __PortableBuild=0. This is because -portablebuld
# has been passed as false. # has been passed as false.
...@@ -17,9 +17,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/coreclr.803ce08ee96925f9d08021c9c6b96af8f2 ...@@ -17,9 +17,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/coreclr.803ce08ee96925f9d08021c9c6b96af8f2
-} -}
\ No newline at end of file \ No newline at end of file
+} +}
diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-04-26 09:22:13.000000000 -0500 --- dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-04-26 09:22:13.000000000 -0500
+++ dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-05-26 23:14:46.115685366 -0500 +++ dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-05-26 23:14:46.115685366 -0500
@@ -3134,6 +3134,75 @@ @@ -3134,6 +3134,75 @@
"any", "any",
"base" "base"
...@@ -96,9 +96,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585 ...@@ -96,9 +96,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585
"sles": [ "sles": [
"sles", "sles",
"linux", "linux",
diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-04-26 09:22:13.000000000 -0500 --- dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-04-26 09:22:13.000000000 -0500
+++ dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-05-31 12:19:46.840094306 -0500 +++ dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-05-31 12:19:46.840094306 -0500
@@ -130,6 +130,12 @@ @@ -130,6 +130,12 @@
<Versions>9</Versions> <Versions>9</Versions>
</RuntimeGroup> </RuntimeGroup>
...@@ -112,9 +112,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585 ...@@ -112,9 +112,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585
<RuntimeGroup Include="sles"> <RuntimeGroup Include="sles">
<Parent>linux</Parent> <Parent>linux</Parent>
<Architectures>x64</Architectures> <Architectures>x64</Architectures>
diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.json diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-04-26 09:22:13.000000000 -0500 --- dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-04-26 09:22:13.000000000 -0500
+++ dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-05-26 22:39:12.849061859 -0500 +++ dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.658544bf73653f734bca9675602fa57440f8b718/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-05-26 22:39:12.849061859 -0500
@@ -1395,6 +1395,40 @@ @@ -1395,6 +1395,40 @@
"rhel-x64" "rhel-x64"
] ]
...@@ -156,9 +156,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585 ...@@ -156,9 +156,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585
"sles": { "sles": {
"#import": [ "#import": [
"linux" "linux"
diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/corehost/build.sh dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/corehost/build.sh diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/corehost/build.sh dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/corehost/build.sh
--- dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/corehost/build.sh 2021-04-26 09:22:53.000000000 -0500 --- dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/corehost/build.sh 2021-04-26 09:22:53.000000000 -0500
+++ dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/corehost/build.sh 2021-05-31 13:05:00.680701122 -0500 +++ dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/corehost/build.sh 2021-05-31 13:05:00.680701122 -0500
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
__rid_plat="" __rid_plat=""
if [ -e /etc/os-release ]; then if [ -e /etc/os-release ]; then
...@@ -168,9 +168,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a ...@@ -168,9 +168,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a
# remove the last version number # remove the last version number
VERSION_ID=${VERSION_ID%.*} VERSION_ID=${VERSION_ID%.*}
fi fi
diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/corehost/common/pal.unix.cpp dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/corehost/common/pal.unix.cpp diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/corehost/common/pal.unix.cpp dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/corehost/common/pal.unix.cpp
--- dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/corehost/common/pal.unix.cpp 2021-04-26 09:22:53.000000000 -0500 --- dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/corehost/common/pal.unix.cpp 2021-04-26 09:22:53.000000000 -0500
+++ dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/corehost/common/pal.unix.cpp 2021-05-31 11:37:30.900210193 -0500 +++ dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/corehost/common/pal.unix.cpp 2021-05-31 11:37:30.900210193 -0500
@@ -496,6 +496,7 @@ @@ -496,6 +496,7 @@
{ {
pal::string_t rhelPrefix(_X("rhel.")); pal::string_t rhelPrefix(_X("rhel."));
...@@ -190,9 +190,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a ...@@ -190,9 +190,9 @@ diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a
if (lastVersionSeparatorIndex != std::string::npos) if (lastVersionSeparatorIndex != std::string::npos)
{ {
diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs diff -ur dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs
--- dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-04-26 09:22:53.000000000 -0500 --- dotnet-v3.1.115-SDK-orig/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-04-26 09:22:53.000000000 -0500
+++ dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.dc339bd0fb2ec082e3afdc0a5ade2066a86d1681/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-05-31 11:34:05.824819023 -0500 +++ dotnet-v3.1.115-SDK-mod/src/dotnet-core-setup.4c6b4aa257241c4d419b8c271e37afac4445b1c0/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-05-31 11:34:05.824819023 -0500
@@ -181,7 +181,7 @@ @@ -181,7 +181,7 @@
lastVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.', lastVersionNumberSeparatorIndex + 1); lastVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.', lastVersionNumberSeparatorIndex + 1);
} }
......
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