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

import dotnet3.1-3.1.115-1.el8_4

parent 0cafa989
diff -Naurp dotnet-v3.1.115-SDK.orig/repos/core-setup.common.targets dotnet-v3.1.115-SDK/repos/core-setup.common.targets
--- dotnet-v3.1.115-SDK.orig/repos/core-setup.common.targets 2021-04-23 07:46:52.000000000 -0700
+++ dotnet-v3.1.115-SDK/repos/core-setup.common.targets 2021-05-29 00:17:21.615962952 -0700
+++ dotnet-v3.1.115-SDK/repos/core-setup.common.targets 2021-05-29 10:12:26.160064785 -0700
@@ -38,6 +38,10 @@
<Copy SourceFiles="@(BinariesToCopy)"
DestinationFolder="$(OutputPath)runtime"
Condition="'@(BinariesToCopy)'!=''" />
+ <!-- For some reason this isn't happening, forcing it -->
+ <!-- This phase isn't happening, let's force it -->
+ <Copy SourceFiles="@(BinariesToCopy)"
+ DestinationFolder="$(SourceBuiltRuntimeDir)$(PublishedVersion)"
+ Condition="'@(BinariesToCopy)'!=''" />
......@@ -14,8 +14,8 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/repos/core-setup.common.targets dotnet-v3.1
</Target>
diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/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 07:22:13.000000000 -0700
+++ dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-05-29 02:34:24.430383390 -0700
@@ -3102,6 +3102,162 @@
+++ dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-05-29 10:48:37.069945245 -0700
@@ -3102,6 +3102,160 @@
"any",
"base"
],
......@@ -32,8 +32,8 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ ],
+ "rhel.8.2-arm64": [
+ "rhel.8.2-arm64",
+ "rhel.8.2",
+ "rhel.8.1-arm64",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0-arm64",
+ "rhel.8.0",
......@@ -50,8 +50,8 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ ],
+ "rhel.8.2-x64": [
+ "rhel.8.2-x64",
+ "rhel.8.2",
+ "rhel.8.1-x64",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0-x64",
+ "rhel.8.0",
......@@ -80,10 +80,10 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ ],
+ "rhel.8.3-arm64": [
+ "rhel.8.3-arm64",
+ "rhel.8.3",
+ "rhel.8.2-arm64",
+ "rhel.8.2",
+ "rhel.8.1-arm64",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0-arm64",
+ "rhel.8.0",
......@@ -100,10 +100,10 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ ],
+ "rhel.8.3-x64": [
+ "rhel.8.3-x64",
+ "rhel.8.3",
+ "rhel.8.2-x64",
+ "rhel.8.2",
+ "rhel.8.1-x64",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0-x64",
+ "rhel.8.0",
......@@ -133,12 +133,11 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ ],
+ "rhel.8.4-arm64": [
+ "rhel.8.4-arm64",
+ "rhel.8.4",
+ "rhel.8.3-arm64",
+ "rhel.8.3",
+ "rhel.8.2-arm64",
+ "rhel.8.2",
+ "rhel.8.1-arm64",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0-arm64",
+ "rhel.8.0",
......@@ -155,12 +154,11 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ ],
+ "rhel.8.4-x64": [
+ "rhel.8.4-x64",
+ "rhel.8.4",
+ "rhel.8.3-x64",
+ "rhel.8.3",
+ "rhel.8.2-x64",
+ "rhel.8.2",
+ "rhel.8.1-x64",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0-x64",
+ "rhel.8.0",
......@@ -178,27 +176,20 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
"rhel.9": [
"rhel.9",
"rhel",
@@ -3133,6 +3289,432 @@
"unix",
"any",
"base"
+ ],
+ "rocky": [
+ "rocky",
+ "rhel",
@@ -3128,6 +3282,432 @@
"rhel-x64",
"rhel",
"linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky-x64": [
+ "rocky-x64",
+ "rocky": [
+ "rocky",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
......@@ -215,28 +206,24 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "any",
+ "base"
+ ],
+ "rocky.8": [
+ "rocky.8",
+ "rocky-x64": [
+ "rocky-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8-x64": [
+ "rocky.8-x64",
+ "rocky.8": [
+ "rocky.8",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
......@@ -257,34 +244,30 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "any",
+ "base"
+ ],
+ "rocky.8.0": [
+ "rocky.8.0",
+ "rocky.8-x64": [
+ "rocky.8-x64",
+ "rocky.8",
+ "rhel.8.0",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.0-x64": [
+ "rocky.8.0-x64",
+ "rocky.8.0": [
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.0",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
......@@ -309,39 +292,36 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "any",
+ "base"
+ ],
+ "rocky.8.1": [
+ "rocky.8.1",
+ "rocky.8.0-x64": [
+ "rocky.8.0-x64",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.1-x64": [
+ "rocky.8.1-x64",
+ "rocky.8.0-x64",
+ "rocky.8.1": [
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.1-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.1",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
......@@ -369,45 +349,41 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "any",
+ "base"
+ ],
+ "rocky.8.2": [
+ "rocky.8.2",
+ "rocky.8.1-x64": [
+ "rocky.8.1-x64",
+ "rocky.8.0-x64",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.1-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.2-x64": [
+ "rocky.8.2-x64",
+ "rocky.8.1-x64",
+ "rocky.8.0-x64",
+ "rocky.8.2": [
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.2-x64",
+ "rhel.8.1-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
......@@ -439,51 +415,47 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "any",
+ "base"
+ ],
+ "rocky.8.3": [
+ "rocky.8.3",
+ "rocky.8.2-x64": [
+ "rocky.8.2-x64",
+ "rocky.8.1-x64",
+ "rocky.8.0-x64",
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.2-x64",
+ "rhel.8.1-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.3-x64": [
+ "rocky.8.3-x64",
+ "rocky.8.2-x64",
+ "rocky.8.1-x64",
+ "rocky.8.0-x64",
+ "rocky.8.3": [
+ "rocky.8.3",
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.3-x64",
+ "rhel.8.2-x64",
+ "rhel.8.1-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
......@@ -519,57 +491,53 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "any",
+ "base"
+ ],
+ "rocky.8.4": [
+ "rocky.8.4",
+ "rocky.8.3-x64": [
+ "rocky.8.3-x64",
+ "rocky.8.2-x64",
+ "rocky.8.1-x64",
+ "rocky.8.0-x64",
+ "rocky.8.3",
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.3-x64",
+ "rhel.8.2-x64",
+ "rhel.8.1-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.4",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.4-x64": [
+ "rocky.8.4-x64",
+ "rocky.8.3-x64",
+ "rocky.8.2-x64",
+ "rocky.8.1-x64",
+ "rocky.8.0-x64",
+ "rocky.8.4": [
+ "rocky.8.4",
+ "rocky.8.3",
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.4-x64",
+ "rhel.8.3-x64",
+ "rhel.8.2-x64",
+ "rhel.8.1-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.4",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
......@@ -608,12 +576,42 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "unix",
+ "any",
+ "base"
],
"sles": [
"sles",
+ ],
+ "rocky.8.4-x64": [
+ "rocky.8.4-x64",
+ "rocky.8.3-x64",
+ "rocky.8.2-x64",
+ "rocky.8.1-x64",
+ "rocky.8.0-x64",
+ "rocky.8.4",
+ "rocky.8.3",
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.4-x64",
+ "rhel.8.3-x64",
+ "rhel.8.2-x64",
+ "rhel.8.1-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.4",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
"linux",
"unix-x64",
"unix",
diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/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 07:22:13.000000000 -0700
+++ dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-05-29 00:56:59.648414097 -0700
+++ dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-05-29 10:50:55.032715214 -0700
@@ -122,7 +122,7 @@
<RuntimeGroup Include="rhel">
<Parent>linux</Parent>
......@@ -647,7 +645,7 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
</Project>
diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/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 07:22:13.000000000 -0700
+++ dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-05-29 02:27:17.161845309 -0700
+++ dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-05-29 11:09:17.464855462 -0700
@@ -1378,6 +1378,57 @@
"rhel.8.0-x64"
]
......@@ -715,16 +713,16 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "rhel"
+ ]
+ },
+ "rocky-x64": {
+ "rocky-arm64": {
+ "#import": [
+ "rocky",
+ "rhel-x64"
+ "rhel-arm64"
+ ]
+ },
+ "rocky-arm64": {
+ "rocky-x64": {
+ "#import": [
+ "rocky",
+ "rhel-arm64"
+ "rhel-x64"
+ ]
+ },
+ "rocky.8": {
......@@ -733,18 +731,18 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "rhel.8"
+ ]
+ },
+ "rocky.8-x64": {
+ "rocky.8-arm64": {
+ "#import": [
+ "rocky.8",
+ "rocky-x64",
+ "rhel.8-x64"
+ "rocky-arm64",
+ "rhel.8-arm64"
+ ]
+ },
+ "rocky.8-arm64": {
+ "rocky.8-x64": {
+ "#import": [
+ "rocky.8",
+ "rocky-arm64",
+ "rhel.8-arm64"
+ "rocky-x64",
+ "rhel.8-x64"
+ ]
+ },
+ "rocky.8.0": {
......@@ -753,18 +751,18 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "rhel.8.0"
+ ]
+ },
+ "rocky.8.0-x64": {
+ "rocky.8.0-arm64": {
+ "#import": [
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.0-x64"
+ "rocky.8-arm64",
+ "rhel.8.0-arm64"
+ ]
+ },
+ "rocky.8.0-arm64": {
+ "rocky.8.0-x64": {
+ "#import": [
+ "rocky.8.0",
+ "rocky.8-arm64",
+ "rhel.8.0-arm64"
+ "rocky.8-x64",
+ "rhel.8.0-x64"
+ ]
+ },
+ "rocky.8.1": {
......@@ -773,18 +771,18 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "rhel.8.1"
+ ]
+ },
+ "rocky.8.1-x64": {
+ "rocky.8.1-arm64": {
+ "#import": [
+ "rocky.8.1",
+ "rocky.8.0-x64",
+ "rhel.8.1-x64"
+ "rocky.8.0-arm64",
+ "rhel.8.1-arm64"
+ ]
+ },
+ "rocky.8.1-arm64": {
+ "rocky.8.1-x64": {
+ "#import": [
+ "rocky.8.1",
+ "rocky.8.0-arm64",
+ "rhel.8.1-arm64"
+ "rocky.8.0-x64",
+ "rhel.8.1-x64"
+ ]
+ },
+ "rocky.8.2": {
......@@ -793,18 +791,18 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "rhel.8.2"
+ ]
+ },
+ "rocky.8.2-x64": {
+ "rocky.8.2-arm64": {
+ "#import": [
+ "rocky.8.2",
+ "rocky.8.1-x64",
+ "rhel.8.2-x64"
+ "rocky.8.1-arm64",
+ "rhel.8.2-arm64"
+ ]
+ },
+ "rocky.8.2-arm64": {
+ "rocky.8.2-x64": {
+ "#import": [
+ "rocky.8.2",
+ "rocky.8.1-arm64",
+ "rhel.8.2-arm64"
+ "rocky.8.1-x64",
+ "rhel.8.2-x64"
+ ]
+ },
+ "rocky.8.3": {
......@@ -813,18 +811,18 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "rhel.8.3"
+ ]
+ },
+ "rocky.8.3-x64": {
+ "rocky.8.3-arm64": {
+ "#import": [
+ "rocky.8.3",
+ "rocky.8.2-x64",
+ "rhel.8.3-x64"
+ "rocky.8.2-arm64",
+ "rhel.8.3-arm64"
+ ]
+ },
+ "rocky.8.3-arm64": {
+ "rocky.8.3-x64": {
+ "#import": [
+ "rocky.8.3",
+ "rocky.8.2-arm64",
+ "rhel.8.3-arm64"
+ "rocky.8.2-x64",
+ "rhel.8.3-x64"
+ ]
+ },
+ "rocky.8.4": {
......@@ -833,18 +831,18 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509