Commit 08d9564b authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet5.0-5.0.205-1.el8_4

parent d25c9f32
From d8abd02c77b21d5f9eda40515d513c2b8ce83380 Mon Sep 17 00:00:00 2001
From: Mustafa Gezen <mustafa@rockylinux.org>
Date: Mon, 14 Jun 2021 14:45:50 +0200
Subject: [PATCH] Add Rocky Linux specific changes
---
.../Enumerations/BuildPlatform.cs | 3 +-
.../src/installer/Directory.Build.props | 10 +-
.../runtime.compatibility.json | 116 ++++++++++++++++++
.../Microsoft.NETCore.Platforms/runtime.json | 57 +++++++++
.../runtimeGroups.props | 8 ++
.../Enumerations/BuildPlatform.cs | 3 +-
.../compiler/resources/runtime.json | 14 +++
.../compiler/resources/runtime.json | 14 +++
8 files changed, 222 insertions(+), 3 deletions(-)
diff --git a/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
index 72e68a0dc..d861d57b7 100644
--- a/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
@@ -15,6 +15,7 @@ public enum BuildPlatform
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-15 12:13:25.061039004 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
OpenSuse = 10,
......@@ -27,10 +10,9 @@ index 72e68a0dc..d861d57b7 100644
+ Rocky = 12,
}
}
diff --git a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props
index 9c82b3bc2..7197feafd 100644
--- a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props
+++ b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props
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-15 12:17:36.476257339 -0700
@@ -172,6 +172,7 @@
<TargetsOpensuse>false</TargetsOpensuse>
<TargetsFedora>false</TargetsFedora>
......@@ -39,7 +21,7 @@ index 9c82b3bc2..7197feafd 100644
<TargetsOracle>false</TargetsOracle>
<TargetsSles>false</TargetsSles>
<TargetsBrowser>false</TargetsBrowser>
@@ -251,6 +252,13 @@
@@ -252,6 +253,13 @@
<TargetsUnix>true</TargetsUnix>
</PropertyGroup>
</When>
......@@ -53,19 +35,18 @@ index 9c82b3bc2..7197feafd 100644
<When Condition="$(OutputRid.StartsWith('opensuse'))">
<PropertyGroup>
<TargetsOpensuse>true</TargetsOpensuse>
@@ -325,7 +333,7 @@
@@ -333,7 +341,7 @@
<InstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.msi</InstallerExtension>
<InstallerExtension Condition="'$(TargetOS)' == 'OSX'">.pkg</InstallerExtension>
<InstallerExtension Condition="'$(TargetsDebian)' == 'true' or '$(TargetsUbuntu)' == 'true' or '$(TargetsLinuxMint)' == 'true' or '$(HostMachineRidTargetsDebianPackages)' == 'true'">.deb</InstallerExtension>
- <InstallerExtension Condition="'$(TargetsRhel)' == 'true' or '$(TargetsCentos)' == 'true' or '$(TargetsOpensuse)' == 'true' or '$(TargetsFedora)' == 'true' or '$(TargetsOracle)' == 'true' or '$(TargetsSles)' == 'true' or '$(HostMachineRidTargetsRpmPackages)' == 'true'">.rpm</InstallerExtension>
+ <InstallerExtension Condition="'$(TargetsRhel)' == 'true' or '$(TargetsCentos)' == 'true' or '$(TargetsRocky)' == 'true' or '$(TargetsOpensuse)' == 'true' or '$(TargetsFedora)' == 'true' or '$(TargetsOracle)' == 'true' or '$(TargetsSles)' == 'true' or '$(HostMachineRidTargetsRpmPackages)' == 'true'">.rpm</InstallerExtension>
- <InstallerExtension Condition="'$(TargetsRhel)' == 'true' or '$(TargetsCentos)' == 'true' or '$(TargetsOpensuse)' == 'true' or '$(TargetsFedora)' == 'true' or '$(TargetsOracle)' == 'true' or '$(TargetsSles)' == 'true' or '$(TargetsCblMariner)' == 'true' or '$(HostMachineRidTargetsRpmPackages)' == 'true'">.rpm</InstallerExtension>
+ <InstallerExtension Condition="'$(TargetsRhel)' == 'true' or '$(TargetsCentos)' == 'true' or '$(TargetsOpensuse)' == 'true' or '$(TargetsRocky)' == 'true' or '$(TargetsFedora)' == 'true' or '$(TargetsOracle)' == 'true' or '$(TargetsSles)' == 'true' or '$(TargetsCblMariner)' == 'true' or '$(HostMachineRidTargetsRpmPackages)' == 'true'">.rpm</InstallerExtension>
<CombinedInstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.exe</CombinedInstallerExtension>
<CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
</PropertyGroup>
diff --git a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index f56d7461e..fbca5ca1c 100644
--- a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
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-15 12:20:09.845220602 -0700
@@ -1704,6 +1704,122 @@
"any",
"base"
......@@ -189,10 +170,34 @@ index f56d7461e..fbca5ca1c 100644
"debian": [
"debian",
"linux",
diff --git a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
index 3e8b2e74e..953760a29 100644
--- a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -7032,4 +7148,4 @@
"any",
"base"
]
-}
\ No newline at end of file
+}
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-06-30 09:07:02.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-07-15 12:22:01.686633530 -0700
@@ -50,6 +50,14 @@
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>
+ <RuntimeGroup Include="rocky">
+ <Parent>rhel</Parent>
+ <Architectures>x64;arm64</Architectures>
+ <Versions>8;9</Versions>
+ <ApplyVersionsToParent>true</ApplyVersionsToParent>
+ <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+ </RuntimeGroup>
+
<RuntimeGroup Include="debian">
<Parent>linux</Parent>
<Architectures>x64;x86;arm;armel;arm64</Architectures>
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.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.json 2021-07-15 12:21:30.674242463 -0700
@@ -601,6 +601,63 @@
"rhel.9-x64"
]
......@@ -257,30 +262,17 @@ index 3e8b2e74e..953760a29 100644
"debian": {
"#import": [
"linux"
diff --git a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index e78268c07..33afd7f79 100644
--- a/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -49,6 +49,14 @@
<ApplyVersionsToParent>true</ApplyVersionsToParent>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>
+
+ <RuntimeGroup Include="rocky">
+ <Parent>rhel</Parent>
+ <Architectures>x64;arm64</Architectures>
+ <Versions>8;9</Versions>
+ <ApplyVersionsToParent>true</ApplyVersionsToParent>
+ <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+ </RuntimeGroup>
<RuntimeGroup Include="debian">
<Parent>linux</Parent>
diff --git a/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
index 72e68a0dc..d861d57b7 100644
--- a/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
@@ -15,6 +15,7 @@ public enum BuildPlatform
@@ -3121,4 +3178,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.205-SDK-mod/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.205-SDK-orig/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-06-30 09:07:35.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-07-15 12:22:41.741138622 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
OpenSuse = 10,
......@@ -289,70 +281,65 @@ index 72e68a0dc..d861d57b7 100644
+ Rocky = 12,
}
}
diff --git a/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json b/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
index a90e2ca80..5dd6baa81 100644
--- a/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
+++ b/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
@@ -331,6 +331,13 @@
"centos.7-x64": {
diff -Naurp dotnet-v5.0.205-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json dotnet-v5.0.205-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
--- dotnet-v5.0.205-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-06-30 09:07:33.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-07-15 12:24:07.873224763 -0700
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
+
+ "rocky": {
+ "#import": [ "rhel" ]
+ },
+ "rocky-x64": {
+ "#import": [ "rocky", "rhel-x64" ]
+ },
+
"debian": {
"#import": [ "linux" ]
@@ -777,6 +784,13 @@
"centos.7-x64-corert": {
},
@@ -778,6 +785,13 @@
"#import": [ "centos.7-corert", "centos-x64-corert", "centos.7-x64" ]
},
+
+ "rocky-corert": {
+ "#import": [ "rel-corert", "rocky" ]
+ },
+ "rocky-x64-corert": {
+ "#import": [ "rocky-corert", "rhel-x64-corert", "rocky-x64" ]
+ },
+
"debian-corert": {
"#import": [ "linux-corert", "debian" ]
diff --git a/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json b/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
index 03f159a9e..fb645df5e 100644
--- a/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
+++ b/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
@@ -331,6 +331,13 @@
"centos.7-x64": {
},
diff -Naurp dotnet-v5.0.205-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json dotnet-v5.0.205-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
--- dotnet-v5.0.205-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-06-30 09:07:33.000000000 -0700
+++ dotnet-v5.0.205-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-07-15 12:24:56.705840565 -0700
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
+
+ "rocky": {
+ "#import": [ "rhel" ]
+ },
+ "rocky-x64": {
+ "#import": [ "rocky", "rhel-x64" ]
+ },
+
"debian": {
"#import": [ "linux" ]
@@ -777,6 +784,13 @@
"centos.7-x64-corert": {
},
@@ -778,6 +785,13 @@
"#import": [ "centos.7-corert", "centos-x64-corert", "centos.7-x64" ]
},
+
+ "rocky-corert": {
+ "#import": [ "rel-corert", "rocky" ]
+ },
+ "rocky-x64-corert": {
+ "#import": [ "rocky-corert", "rhel-x64-corert", "rocky-x64" ]
+ },
+
"debian-corert": {
"#import": [ "linux-corert", "debian" ]
--
2.24.3 (Apple Git-128)
},
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