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

import dotnet3.1-3.1.115-1.el8_4

parent a248bb29
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 10:12:26.160064785 -0700
@@ -38,6 +38,10 @@
<Copy SourceFiles="@(BinariesToCopy)"
DestinationFolder="$(OutputPath)runtime"
Condition="'@(BinariesToCopy)'!=''" />
+ <!-- This phase isn't happening, let's force it -->
+ <Copy SourceFiles="@(BinariesToCopy)"
+ DestinationFolder="$(SourceBuiltRuntimeDir)$(PublishedVersion)"
+ Condition="'@(BinariesToCopy)'!=''" />
<WriteLinesToFile File="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete" Overwrite="true" />
</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
diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.115-SDK.major/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 10:48:37.069945245 -0700
@@ -3102,6 +3102,160 @@
+++ dotnet-v3.1.115-SDK.major/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-05-29 16:01:58.036102403 -0700
@@ -3134,6 +3134,80 @@
"any",
"base"
],
+ "rhel.8.2": [
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rhel.8.2-arm64": [
+ "rhel.8.2-arm64",
+ "rhel.8.1-arm64",
+ "rhel.8.2",
+ "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.2-x64": [
+ "rhel.8.2-x64",
+ "rhel.8.1-x64",
+ "rhel.8.2",
+ "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.2-arm64",
+ "rhel.8.1-arm64",
+ "rhel.8.3",
+ "rhel.8.2",
+ "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.2-x64",
+ "rhel.8.1-x64",
+ "rhel.8.3",
+ "rhel.8.2",
+ "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.3-arm64",
+ "rhel.8.2-arm64",
+ "rhel.8.1-arm64",
+ "rhel.8.3",
+ "rhel.8.2",
+ "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.3-x64",
+ "rhel.8.2-x64",
+ "rhel.8.1-x64",
+ "rhel.8.3",
+ "rhel.8.2",
+ "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.9": [
"rhel.9",
"rhel",
@@ -3128,6 +3282,432 @@
"rhel-x64",
"rhel",
"linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky": [
+ "rocky",
+ "rhel",
......@@ -260,451 +79,31 @@ diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509
+ "any",
+ "base"
+ ],
+ "rocky.8.0": [
+ "rocky.8.0",
+ "rocky.8",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "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.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",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.1": [
+ "rocky.8.1",
+ "rocky.8.0",
+ "rocky.8",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rocky",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "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",
+ "rhel.8-arm64",
+ "rocky",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "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",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "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-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.8-arm64",
+ "rocky",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "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.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "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-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.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.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "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-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"
+ ],
+ "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",
"sles": [
"sles",
"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
diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.115-SDK.major/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 10:50:55.032715214 -0700
@@ -122,7 +122,7 @@
<RuntimeGroup Include="rhel">
<Parent>linux</Parent>
<Architectures>x64;arm64</Architectures>
- <Versions>8;8.0;8.1</Versions>
+ <Versions>8;8.0;8.1;8.2;8.3;8.4</Versions>
</RuntimeGroup>
<RuntimeGroup Include="rhel">
<Parent>linux</Parent>
@@ -130,6 +130,13 @@
+++ dotnet-v3.1.115-SDK.major/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-05-29 15:59:04.904866861 -0700
@@ -130,6 +130,14 @@
<Versions>9</Versions>
</RuntimeGroup>
+ <RuntimeGroup Include="rocky">
+ <Parent>rhel</Parent>
+ <Architectures>x64;arm64</Architectures>
+ <Versions>8;8.0;8.1;8.2;8.3;8.4</Versions>
+ <Versions>8</Versions>
+ <ApplyVersionsToParent>true</ApplyVersionsToParent>
+ <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+ </RuntimeGroup>
+
<RuntimeGroup Include="sles">
<Parent>linux</Parent>
<Architectures>x64</Architectures>
@@ -186,6 +193,6 @@
RuntimeJson="runtime.json"
CompatibilityMap="runtime.compatibility.json"
RuntimeDirectedGraph="$(PackageReportDir)$(Id)$(NuspecSuffix)-runtime.json.dgml"
- UpdateRuntimeFiles="$(UpdateRuntimeFiles)" />
+ UpdateRuntimeFiles="true" />
</Target>
</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
diff -Naurp dotnet-v3.1.115-SDK.orig/src/dotnet-corefx.585ae475d8aebdecf310d7509585003721509c5a/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.115-SDK.major/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 11:09:17.464855462 -0700
@@ -1378,6 +1378,57 @@
"rhel.8.0-x64"
]
},
+ "rhel.8.2": {
+ "#import": [
+ "rhel.8.1"
+ ]
+ },
+ "rhel.8.2-arm64": {
+ "#import": [
+ "rhel.8.2",
+ "rhel.8.1-arm64"
+ ]
+ },
+ "rhel.8.2-x64": {
+ "#import": [
+ "rhel.8.2",
+ "rhel.8.1-x64"
+ ]
+ },
+ "rhel.8.3": {
+ "#import": [
+ "rhel.8.2"
+ ]
+ },
+ "rhel.8.3-arm64": {
+ "#import": [
+ "rhel.8.3",
+ "rhel.8.2-arm64"
+ ]
+ },
+ "rhel.8.3-x64": {
+ "#import": [
+ "rhel.8.3",
+ "rhel.8.2-x64"
+ ]
+ },
+ "rhel.8.4": {
+ "#import": [
+ "rhel.8.3"
+ ]
+ },
+ "rhel.8.4-arm64": {
+ "#import": [
+ "rhel.8.4",
+ "rhel.8.3-arm64"
+ ]
+ },
+ "rhel.8.4-x64": {
+ "#import": [
+ "rhel.8.4",
+ "rhel.8.3-x64"
+ ]
+ },
"rhel.9": {