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

import dotnet5.0-5.0.205-1.el8_4

parent 75de3854
diff -Naurp dotnet-v5.0.205-SDK-orig/build.sh dotnet-v5.0.205-SDK-mod/build.sh
--- dotnet-v5.0.205-SDK-orig/build.sh 2021-06-30 07:30:44.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/build.sh 2021-07-16 09:16:31.220538779 -0700
@@ -110,6 +110,53 @@ if [ -d "$CUSTOM_SDK_DIR" ]; then
export _InitializeDotNetCli="$CLI_ROOT/dotnet"
export CustomDotNetSdkDir="$CLI_ROOT"
echo "Using custom bootstrap SDK from '$CLI_ROOT', version '$SDK_VERSION'"
+ #add 8.4 entries in case dotnet used has no support for 8.4#
+ RIDGRAPH=$(find $CLI_ROOT -name RuntimeIdentifierGraph.json)
+ if ! grep -q rocky.8.4 $RIDGRAPH && ! grep -q rhel.8.4 $RIDGRAPH; then
+ sed -i '$d' $RIDGRAPH; sed -i '$d' $RIDGRAPH; sed -i '$d' $RIDGRAPH
+ cat <<EOF>> $RIDGRAPH
+ },
+ "rocky.8.4": {
+ "#import": [
+ "rocky.8.3",
+ "rhel.8.4"
+ ]
+ },
+ "rocky.8.4-arm64": {
+ "#import": [
+ "rocky.8.4",
+ "rocky.8.3-arm64",
+ "rhel.8.4-arm64"
+ ]
+ },
+ "rocky.8.4-x64": {
+ "#import": [
+ "rocky.8.4",
+ "rocky.8.3-x64",
+ "rhel.8.4-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"
+ ]
+ }
+ }
+}
+EOF
+ fi
else
sdkLine=`grep -m 1 'dotnet' "$SCRIPT_ROOT/global.json"`
sdkPattern="\"dotnet\" *: *\"(.*)\""
diff -Naurp dotnet-v5.0.205-SDK-orig/repos/Directory.Build.targets dotnet-v5.0.205-SDK-mod/repos/Directory.Build.targets
--- dotnet-v5.0.205-SDK-orig/repos/Directory.Build.targets 2021-06-30 07:30:44.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/repos/Directory.Build.targets 2021-07-16 08:25:45.224937655 -0700
@@ -53,7 +53,7 @@
<!-- Source override arguments -->
<PropertyGroup Condition="'$(SourceOverrideRepoApiImplemented)' == 'true'">
<RepoApiArgs>$(RepoApiArgs) /p:DotNetRestoreSourcePropsPath=$(RestoreSourcePropsPath)</RepoApiArgs>
- <RepoApiArgs Condition="'$(OfflineBuild)' == 'true'">$(RepoApiArgs) /p:DotNetBuildOffline=true</RepoApiArgs>
+ <RepoApiArgs Condition="'$(OfflineBuild)' == 'true'">$(RepoApiArgs) /p:DotNetBuildOffline=true /p:UpdateRuntimeFiles=true</RepoApiArgs>
</PropertyGroup>
<!-- Output placement arguments -->
<PropertyGroup Condition="'$(OutputPlacementRepoApiImplemented)' == 'true'">
diff -Naurp dotnet-v5.0.205-SDK-orig/repos/runtime.common.targets dotnet-v5.0.205-SDK-mod/repos/runtime.common.targets
--- dotnet-v5.0.205-SDK-orig/repos/runtime.common.targets 2021-06-30 07:30:44.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/repos/runtime.common.targets 2021-07-16 08:29:17.067685682 -0700
@@ -64,6 +64,10 @@
<Copy SourceFiles="@(BinariesToCopy)"
DestinationFolder="$(OutputPath)runtime"
Condition="'@(BinariesToCopy)'!=''" />
+<!-- Try do do what PublishBinaries fails to do -->
+ <Copy SourceFiles="@(BinariesToCopy)"
+ DestinationFolder="$(SourceBuiltRuntimeDir)$(PublishedVersion)"
+ Condition="'@(BinariesToCopy)'!=''" />
<WriteLinesToFile File="$(RepoCompletedSemaphorePath)CopyBinariesToBinFolder.complete" Overwrite="true" />
</Target>
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.205-SDK-mod/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.205-SDK-orig/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-06-30 09:07:53.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-07-16 09:08:25.336194235 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-07-16 10:02:57.744798538 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
......@@ -95,7 +12,7 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-installer.64a0cf25eb840995b3a0bf
}
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props
--- dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props 2021-06-30 09:06:56.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props 2021-07-16 09:10:01.497449878 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props 2021-07-16 10:04:58.230362584 -0700
@@ -172,6 +172,7 @@
<TargetsOpensuse>false</TargetsOpensuse>
<TargetsFedora>false</TargetsFedora>
......@@ -129,167 +46,11 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb
</PropertyGroup>
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-06-30 09:07:02.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-07-16 09:19:50.588142105 -0700
@@ -1704,6 +1704,630 @@
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-07-16 10:07:04.485001518 -0700
@@ -1704,6 +1704,122 @@
"any",
"base"
],
+ "rhel.8.2": [
+ "rhel.8.2",
+ "rhel.8.1",
+ "rhel.8.0",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "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.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.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-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-arm64": [
+ "rhel.8.4-arm64",
+ "rhel.8.3-arm64",
+ "rhel.8.2-arm64",
+ "rhel.8.1-arm64",
+ "rhel.8.4",
+ "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.4",
+ "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"
+ ],
+ "rocky": [
+ "rocky",
+ "rhel",
......@@ -364,358 +125,6 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb
+ "any",
+ "base"
+ ],
+ "rocky.8.0": [
+ "rocky.8.0",
+ "rocky.8",
+ "rhel.8.0",
+ "ol",
+ "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",
+ "ol-arm64",
+ "rhel.8-arm64",
+ "ol",
+ "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",
+ "ol-x64",
+ "rhel.8-x64",
+ "ol",
+ "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",
+ "ol",
+ "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",
+ "ol-arm64",
+ "rhel.8-arm64",
+ "ol",
+ "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",
+ "ol-x64",
+ "rhel.8-x64",
+ "ol",
+ "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",
+ "ol",
+ "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",
+ "ol-arm64",
+ "rhel.8-arm64",
+ "ol",
+ "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",
+ "ol-x64",
+ "rhel.8-x64",
+ "ol",
+ "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",
+ "ol",
+ "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",
+ "ol-arm64",
+ "rhel.8-arm64",
+ "ol",
+ "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",
+ "ol-x64",
+ "rhel.8-x64",
+ "ol",
+ "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",
+ "ol",
+ "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",
+ "ol-arm64",
+ "rhel.8-arm64",
+ "ol",
+ "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",
+ "ol-x64",
+ "rhel.8-x64",
+ "ol",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.9": [
+ "rocky.9",
+ "rocky",
......@@ -761,7 +170,7 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687eb