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

import dotnet5.0-5.0.204-1.el8_4

parent cb96b9dd
From 8f71dea8d2070f626a55dbb9302a877a8b0667de Mon Sep 17 00:00:00 2001
From d8abd02c77b21d5f9eda40515d513c2b8ce83380 Mon Sep 17 00:00:00 2001
From: Mustafa Gezen <mustafa@rockylinux.org>
Date: Mon, 14 Jun 2021 19:42:51 +0200
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 | 159 ++++++++++++++++++
.../Microsoft.NETCore.Platforms/runtime.json | 77 +++++++++
.../runtimeGroups.props | 8 +
.../runtime.compatibility.json | 116 ++++++++++++++++++
.../Microsoft.NETCore.Platforms/runtime.json | 57 +++++++++
.../runtimeGroups.props | 8 ++
.../Enumerations/BuildPlatform.cs | 3 +-
.../compiler/resources/runtime.json | 21 +++
.../compiler/resources/runtime.json | 21 +++
8 files changed, 299 insertions(+), 3 deletions(-)
.../compiler/resources/runtime.json | 14 +++
.../compiler/resources/runtime.json | 14 +++
8 files changed, 222 insertions(+), 3 deletions(-)
diff --git a/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
index 72e68a0dc..d861d57b7 100644
......@@ -63,10 +63,10 @@ index 9c82b3bc2..7197feafd 100644
<CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
</PropertyGroup>
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index f56d7461e..fbb63505d 100644
index f56d7461e..fbca5ca1c 100644
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -1704,6 +1704,165 @@
@@ -1704,6 +1704,122 @@
"any",
"base"
],
......@@ -144,49 +144,6 @@ index f56d7461e..fbb63505d 100644
+ "any",
+ "base"
+ ],
+ "rocky.8.4": [
+ "rocky.8.4",
+ "rocky.8",
+ "rocky",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8.4-arm64": [
+ "rocky.8.4-arm64",
+ "rocky.8.4",
+ "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.4",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.9": [
+ "rocky.9",
+ "rocky",
......@@ -233,10 +190,10 @@ index f56d7461e..fbb63505d 100644
"debian",
"linux",
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
index 3e8b2e74e..3de13c18e 100644
index 3e8b2e74e..953760a29 100644
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -601,6 +601,83 @@
@@ -601,6 +601,63 @@
"rhel.9-x64"
]
},
......@@ -277,26 +234,6 @@ index 3e8b2e74e..3de13c18e 100644
+ "rhel.8-x64"
+ ]
+ },
+ "rocky.8.4": {
+ "#import": [
+ "rocky",
+ "rhel.8"
+ ]
+ },
+ "rocky.8.4-arm64": {
+ "#import": [
+ "rocky.8.4",
+ "rocky-arm64",
+ "rhel.8-arm64"
+ ]
+ },
+ "rocky.8.4-x64": {
+ "#import": [
+ "rocky.8.4",
+ "rocky-x64",
+ "rhel.8-x64"
+ ]
+ },
+ "rocky.9": {
+ "#import": [
+ "rocky",
......@@ -321,7 +258,7 @@ index 3e8b2e74e..3de13c18e 100644
"#import": [
"linux"
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index e78268c07..f0ae7667d 100644
index e78268c07..33afd7f79 100644
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -49,6 +49,14 @@
......@@ -332,7 +269,7 @@ index e78268c07..f0ae7667d 100644
+ <RuntimeGroup Include="rocky">
+ <Parent>rhel</Parent>
+ <Architectures>x64;arm64</Architectures>
+ <Versions>8;8.3;8.4;9</Versions>
+ <Versions>8;9</Versions>
+ <ApplyVersionsToParent>true</ApplyVersionsToParent>
+ <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+ </RuntimeGroup>
......@@ -353,10 +290,10 @@ index 72e68a0dc..d861d57b7 100644
}
}
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..35a92e673 100644
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,20 @@
@@ -331,6 +331,13 @@
"centos.7-x64": {
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
......@@ -366,18 +303,11 @@ index a90e2ca80..35a92e673 100644
+ },
+ "rocky-x64": {
+ "#import": [ "rocky", "rhel-x64" ]
+ },
+
+ "rocky.8.4": {
+ "#import": [ "rhel" ]
+ },
+ "rocky.8.4-x64": {
+ "#import": [ "rocky", "rhel-x64" ]
+ },
"debian": {
"#import": [ "linux" ]
@@ -777,6 +791,13 @@
@@ -777,6 +784,13 @@
"centos.7-x64-corert": {
"#import": [ "centos.7-corert", "centos-x64-corert", "centos.7-x64" ]
},
......@@ -392,10 +322,10 @@ index a90e2ca80..35a92e673 100644
"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..727fd4e1b 100644
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,20 @@
@@ -331,6 +331,13 @@
"centos.7-x64": {
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
......@@ -405,18 +335,11 @@ index 03f159a9e..727fd4e1b 100644
+ },
+ "rocky-x64": {
+ "#import": [ "rocky", "rhel-x64" ]
+ },
+
+ "rocky.8.4": {
+ "#import": [ "rhel" ]
+ },
+ "rocky8.4-x64": {
+ "#import": [ "rocky.8.4", "rhel-x64" ]
+ },
"debian": {
"#import": [ "linux" ]
@@ -777,6 +791,13 @@
@@ -777,6 +784,13 @@
"centos.7-x64-corert": {
"#import": [ "centos.7-corert", "centos-x64-corert", "centos.7-x64" ]
},
......
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