Commit 204fa03b authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet3.1-3.1.115-1.el8_4

parent 099c5419
--- dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-04-26 07:22:13.000000000 -0700
+++ dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-05-28 21:03:04.720083368 -0700
@@ -3134,6 +3134,174 @@
diff -Naur 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
@@ -38,6 +38,10 @@
<Copy SourceFiles="@(BinariesToCopy)"
DestinationFolder="$(OutputPath)runtime"
Condition="'@(BinariesToCopy)'!=''" />
+ <!-- For some reason this isn't happening, forcing it -->
+ <Copy SourceFiles="@(BinariesToCopy)"
+ DestinationFolder="$(SourceBuiltRuntimeDir)$(PublishedVersion)"
+ Condition="'@(BinariesToCopy)'!=''" />
<WriteLinesToFile File="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete" Overwrite="true" />
</Target>
diff -Naur 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 00:54:26.238448554 -0700
@@ -3102,6 +3102,162 @@
"any",
"base"
],
+ "rocky": [
+ "rocky",
+ "rhel.8.2": [
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky-arm64": [
+ "rocky-arm64",
+ "rocky",
+ "rhel.8.2-arm64": [
+ "rhel.8.2-arm64",
+ "rhel.8.2",
+ "rhel.8.1-arm64",
+ "rhel.8.1",
+ "rhel.8.0-arm64",
+ "rhel.8.0",
+ "rhel.8-arm64",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
......@@ -24,9 +48,124 @@
+ "any",
+ "base"
+ ],
+ "rocky-x64": [
+ "rocky-x64",
+ "rocky",
+ "rhel.8.2-x64": [
+ "rhel.8.2-x64",
+ "rhel.8.2",
+ "rhel.8.1-x64",
+ "rhel.8.1",
+ "rhel.8.0-x64",
+ "rhel.8.0",
+ "rhel.8-x64",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rhel.8.3": [
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rhel.8.3-arm64": [
+ "rhel.8.3-arm64",
+ "rhel.8.3",
+ "rhel.8.2-arm64",
+ "rhel.8.2",
+ "rhel.8.1-arm64",
+ "rhel.8.1",
+ "rhel.8.0-arm64",
+ "rhel.8.0",
+ "rhel.8-arm64",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rhel.8.3-x64": [
+ "rhel.8.3-x64",
+ "rhel.8.3",
+ "rhel.8.2-x64",
+ "rhel.8.2",
+ "rhel.8.1-x64",
+ "rhel.8.1",
+ "rhel.8.0-x64",
+ "rhel.8.0",
+ "rhel.8-x64",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rhel.8.4": [
+ "rhel.8.4",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "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.1",
+ "rhel.8.0-arm64",
+ "rhel.8.0",
+ "rhel.8-arm64",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "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.1",
+ "rhel.8.0-x64",
+ "rhel.8.0",
+ "rhel.8-x64",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
......@@ -35,6 +174,14 @@
+ "unix",
+ "any",
+ "base"
+ ],
"rhel.9": [
"rhel.9",
"rhel",
@@ -3133,6 +3289,400 @@
"unix",
"any",
"base"
+ ],
+ "rocky.8": [
+ "rocky.8",
......@@ -46,6 +193,22 @@
+ "any",
+ "base"
+ ],
+ "rocky.8-x64": [
+ "rocky.8-x64",
+ "rocky.8",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8-arm64": [
+ "rocky.8-arm64",
+ "rocky.8",
......@@ -62,9 +225,25 @@
+ "any",
+ "base"
+ ],
+ "rocky.8-x64": [
+ "rocky.8.0": [
+ "rocky.8.0",
+ "rocky.8",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.0-x64": [
+ "rocky.8.0-x64",
+ "rocky.8.0",
+ "rocky.8-x64",
+ "rhel.8.0-x64",
+ "rocky.8",
+ "rhel.8.0",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
......@@ -78,10 +257,32 @@
+ "any",
+ "base"
+ ],
+ "rocky.8.4": [
+ "rocky.8.4",
+ "rocky.8.0-arm64": [
+ "rocky.8.0-arm64",
+ "rocky.8.0",
+ "rocky.8-arm64",
+ "rhel.8.0-arm64",
+ "rocky.8",
+ "rhel.8.0",
+ "rocky-arm64",
+ "rhel.8-arm64",
+ "rocky",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.1": [
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel",
......@@ -90,11 +291,14 @@
+ "any",
+ "base"
+ ],
+ "rocky.8.4-x64": [
+ "rocky.8.4-x64",
+ "rocky.8.4",
+ "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.1",
+ "rocky-x64",
......@@ -110,11 +314,14 @@
+ "any",
+ "base"
+ ],
+ "rocky.8.4-arm64": [
+ "rocky.8.4-arm64",
+ "rocky.8.4",
+ "rocky.8.1-arm64": [
+ "rocky.8.1-arm64",
+ "rocky.8.0-arm64",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-arm64",
+ "rhel.8.1-arm64",
+ "rhel.8.0-arm64",
+ "rocky.8",
+ "rhel.8.1",
+ "rocky-arm64",
......@@ -130,23 +337,67 @@
+ "any",
+ "base"
+ ],
+ "rocky.9": [
+ "rocky.9",
+ "rocky.8.2": [
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "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.2",
+ "rhel.8.1",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.9",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.9-arm64": [
+ "rocky.9-arm64",
+ "rocky.9",
+ "rocky.8.2-arm64": [
+ "rocky.8.2-arm64",
+ "rocky.8.1-arm64",
+ "rocky.8.0-arm64",
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-arm64",
+ "rhel.8.2-arm64",
+ "rhel.8.1-arm64",
+ "rhel.8.0-arm64",
+ "rocky.8",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rocky-arm64",
+ "rhel.9-arm64",
+ "rhel.8-arm64",
+ "rocky",
+ "rhel.9",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
......@@ -156,13 +407,46 @@
+ "any",
+ "base"
+ ],
+ "rocky.9-x64": [
+ "rocky.9-x64",
+ "rocky.9",
+ "rocky.8.3": [
+ "rocky.8.3",
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "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.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.9-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.9",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
......@@ -172,116 +456,160 @@
+ "any",
+ "base"
+ ],
+ "rocky.8.3-arm64": [
+ "rocky.8.3-arm64",
+ "rocky.8.2-arm64",
+ "rocky.8.1-arm64",
+ "rocky.8.0-arm64",
+ "rocky.8.3",
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-arm64",
+ "rhel.8.3-arm64",
+ "rhel.8.2-arm64",
+ "rhel.8.1-arm64",
+ "rhel.8.0-arm64",
+ "rocky.8",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rocky-arm64",
+ "rhel.8-arm64",
+ "rocky",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.4": [
+ "rocky.8.4",
+ "rocky.8.3",
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8",
+ "rhel.8.4",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "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.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",
+ "any",
+ "base"
+ ],
+ "rocky.8.4-arm64": [
+ "rocky.8.4-arm64",
+ "rocky.8.3-arm64",
+ "rocky.8.2-arm64",
+ "rocky.8.1-arm64",
+ "rocky.8.0-arm64",
+ "rocky.8.4",
+ "rocky.8.3",
+ "rocky.8.2",
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8-arm64",
+ "rhel.8.4-arm64",
+ "rhel.8.3-arm64",
+ "rhel.8.2-arm64",
+ "rhel.8.1-arm64",
+ "rhel.8.0-arm64",
+ "rocky.8",
+ "rhel.8.4",
+ "rhel.8.3",
+ "rhel.8.2",
+ "rhel.8.1",
+ "rocky-arm64",
+ "rhel.8-arm64",
+ "rocky",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
],
"sles": [
"sles",
"linux",
diff -Naurp dotnet-v3.1.115-SDK/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
--- dotnet-v3.1.115-SDK/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-04-26 07:22:13.000000000 -0700
+++ dotnet-v3.1.115-SDK-mod/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-05-28 21:06:46.394913605 -0700
@@ -1395,6 +1395,83 @@
"rhel-x64"
]
},
+ "rocky": {
+ "#import": [
+ "rhel"
+ ]
+ },
+ "rocky-arm64": {
+ "#import": [
+ "rocky",
+ "rhel-arm64"
+ ]
+ },
+ "rocky-x64": {
+ "#import": [
+ "rocky",
+ "rhel-x64"
+ ]
+ },
+ "rocky.8": {
+ "#import": [
+ "rocky",
+ "rhel.8"
+ ]
+ },
+ "rocky.8-arm64": {
+ "#import": [
+ "rocky.8",
+ "rocky-arm64",
+ "rhel.8-arm64"
+ ]
+ },
+ "rocky.8-x64": {
+ "#import": [
+ "rocky.8",
+ "rocky-x64",
+ "rhel.8-x64"
+ ]
+ },
+ "rocky.8.4": {
+ "#import": [
+ "rocky.8",
+ "rhel.8.1"
+ ]
+ },
+ "rocky.8.4-x64": {
+ "#import": [
+ "rocky.8.4",
+ "rocky.8-x64",
+ "rhel.8.1-x64"
+ ]
+ },
+ "rocky.8.4-arm64": {
+ "#import": [
+ "rocky.8.4",
+ "rocky.8-arm64",
+ "rhel.8.1-arm64"
+ ]
+ },
+ "rocky.9": {
+ "#import": [
+ "rocky",
+ "rhel.9"
+ ]
+ },
+ "rocky.9-arm64": {
+ "#import": [
+ "rocky.9",
+ "rocky-arm64",
+ "rhel.9-arm64"
+ ]
+ },
+ "rocky.9-x64": {
+ "#import": [
+ "rocky.9",
+ "rocky-x64",
+ "rhel.9-x64"
+ ]
+ },