Commit 9d5f1259 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet5.0-5.0.204-1.el8_4

parent 988810e1
diff -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.204-SDK/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.204-SDK-orig/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-05-25 14:12:49.000000000 -0700
+++ dotnet-v5.0.204-SDK/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-06-11 09:56:53.618235698 -0700
@@ -15,6 +15,7 @@
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.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
index 72e68a0dc..d861d57b7 100644
--- a/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f85b3b024ff3ddaa9e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
@@ -15,6 +15,7 @@ public enum BuildPlatform
Debian = 8,
Fedora = 9,
OpenSuse = 10,
......@@ -10,9 +27,10 @@ diff -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-installer.84d1fe1bb7a65f28ca55d2f
+ Rocky = 12,
}
}
diff -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props dotnet-v5.0.204-SDK/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props
--- dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props 2021-05-25 14:11:57.000000000 -0700
+++ dotnet-v5.0.204-SDK/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props 2021-06-11 10:00:05.270674071 -0700
diff --git a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props
index 9c82b3bc2..7197feafd 100644
--- a/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props
+++ b/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/installer/Directory.Build.props
@@ -172,6 +172,7 @@
<TargetsOpensuse>false</TargetsOpensuse>
<TargetsFedora>false</TargetsFedora>
......@@ -44,9 +62,10 @@ diff -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154
<CombinedInstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.exe</CombinedInstallerExtension>
<CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
</PropertyGroup>
diff -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v5.0.204-SDK/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-05-25 14:12:03.000000000 -0700
+++ dotnet-v5.0.204-SDK/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-06-11 10:03:32.678312896 -0700
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..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,122 @@
"any",
"base"
......@@ -170,34 +189,10 @@ diff -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154
"debian": [
"debian",
"linux",
@@ -7032,4 +7148,4 @@
"any",
"base"
]
-}
\ No newline at end of file
+}
diff -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v5.0.204-SDK/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-05-25 14:12:03.000000000 -0700
+++ dotnet-v5.0.204-SDK/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-06-11 10:04:44.702229247 -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 -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v5.0.204-SDK/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-05-25 14:12:03.000000000 -0700
+++ dotnet-v5.0.204-SDK/src/dotnet-runtime.556582d964cc21b82a88d7154e915076f6f9008e/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-06-11 10:04:10.970800089 -0700
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..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,63 @@
"rhel.9-x64"
]
......@@ -262,17 +257,30 @@ diff -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-runtime.556582d964cc21b82a88d7154
"debian": {
"#import": [
"linux"
@@ -3121,4 +3178,4 @@
]
}
}
-}
\ No newline at end of file
+}
diff -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs dotnet-v5.0.204-SDK/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
--- dotnet-v5.0.204-SDK-orig/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-05-25 14:12:33.000000000 -0700
+++ dotnet-v5.0.204-SDK/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-06-11 10:05:13.868600326 -0700
@@ -15,6 +15,7 @@
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..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 @@
<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.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
index 72e68a0dc..d861d57b7 100644
--- a/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb82d5e599bf5e/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
@@ -15,6 +15,7 @@ public enum BuildPlatform
Debian = 8,
Fedora = 9,
OpenSuse = 10,
......@@ -281,65 +289,70 @@ diff -Naur dotnet-v5.0.204-SDK-orig/src/dotnet-sdk.b4ddf0facd49caab999e4accd6cb8
+ Rocky = 12,
}
}
diff -Naur dotnet-v5.0.204-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json dotnet-v5.0.204-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json
--- dotnet-v5.0.204-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-05-25 14:12:31.000000000 -0700
+++ dotnet-v5.0.204-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-06-11 10:07:40.249462940 -0700
@@ -332,6 +332,13 @@
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": {
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
+
+ "rocky": {
+ "#import": [ "rhel" ]
+ },
+ "rocky-x64": {
+ "#import": [ "rocky", "rhel-x64" ]
+ },
+
"debian": {
"#import": [ "linux" ]
},
@@ -778,6 +785,13 @@
@@ -777,6 +784,13 @@
"centos.7-x64-corert": {
"#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 -Naur dotnet-v5.0.204-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json dotnet-v5.0.204-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json
--- dotnet-v5.0.204-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-05-25 14:12:31.000000000 -0700
+++ dotnet-v5.0.204-SDK/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-06-11 10:08:46.825310726 -0700
@@ -332,6 +332,13 @@
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": {
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
+
+ "rocky": {
+ "#import": [ "rhel" ]
+ },
+ "rocky-x64": {
+ "#import": [ "rocky", "rhel-x64" ]
+ },
+
"debian": {
"#import": [ "linux" ]
},
@@ -778,6 +785,13 @@
@@ -777,6 +784,13 @@
"centos.7-x64-corert": {
"#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)
......@@ -529,7 +529,7 @@ echo "Testing build results for debug symbols..."
%changelog
* Fri Jun 11 2021 Mustafa Gezen <mustafa@rockylinux.org> - 5.0.204-1.rocky
* Mon Jun 14 2021 Mustafa Gezen <mustafa@rockylinux.org> - 5.0.204-1.rocky
- Add Rocky Linux specific changes
* Mon May 31 2021 Omair Majid <omajid@redhat.com> - 5.0.204-1
......
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