Commit 41858de0 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet5.0-5.0.204-1.el8_4

parent bcc35ae8
......@@ -14,10 +14,10 @@ Subject: [PATCH] Add Rocky Linux specific changes
.../compiler/resources/runtime.json | 14 +++
8 files changed, 222 insertions(+), 3 deletions(-)
diff --git a/src/dotnet-installer.b5f47e6c6aa198df48121dc3076c9626f50b116e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-installer.b5f47e6c6aa198df48121dc3076c9626f50b116e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
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.b5f47e6c6aa198df48121dc3076c9626f50b116e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-installer.b5f47e6c6aa198df48121dc3076c9626f50b116e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
--- 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,
......@@ -27,10 +27,10 @@ index 72e68a0dc..d861d57b7 100644
+ Rocky = 12,
}
}
diff --git a/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/installer/Directory.Build.props b/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/installer/Directory.Build.props
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.478b2f8c0e480665f6c52c95cd57830784dc9560/src/installer/Directory.Build.props
+++ b/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/installer/Directory.Build.props
--- 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>
......@@ -62,10 +62,10 @@ index 9c82b3bc2..7197feafd 100644
<CombinedInstallerExtension Condition="'$(TargetOS)' == 'Windows_NT'">.exe</CombinedInstallerExtension>
<CombinedInstallerExtension Condition="'$(TargetOS)' != 'Windows_NT'">$(InstallerExtension)</CombinedInstallerExtension>
</PropertyGroup>
diff --git a/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
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.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- 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"
......@@ -189,10 +189,10 @@ index f56d7461e..fbca5ca1c 100644
"debian": [
"debian",
"linux",
diff --git a/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
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.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json
--- 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"
]
......@@ -257,10 +257,10 @@ index 3e8b2e74e..953760a29 100644
"debian": {
"#import": [
"linux"
diff --git a/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
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.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- 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>
......@@ -276,10 +276,10 @@ index e78268c07..33afd7f79 100644
<RuntimeGroup Include="debian">
<Parent>linux</Parent>
diff --git a/src/dotnet-sdk.b8025906f7463b6e477893c81238dc7003b353a3/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-sdk.b8025906f7463b6e477893c81238dc7003b353a3/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
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.b8025906f7463b6e477893c81238dc7003b353a3/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
+++ b/src/dotnet-sdk.b8025906f7463b6e477893c81238dc7003b353a3/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs
--- 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,
......
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