import dotnet5.0-5.0.203-1.el8_4

SOURCES/0001-Add-Rocky-Linux-specific-changes.patch

+From 7f95056262ec5ef191ab642e1e4c4a4cb3785303 Mon Sep 17 00:00:00 2001
+From: Mustafa Gezen <mustafa@rockylinux.org>
+Date: Tue, 1 Jun 2021 03:47:44 +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.b5f47e6c6aa198df48121dc3076c9626f50b116e/src/core-sdk-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-installer.b5f47e6c6aa198df48121dc3076c9626f50b116e/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
+@@ -15,6 +15,7 @@ public enum BuildPlatform
+         Debian = 8,
+         Fedora = 9,
+         OpenSuse = 10,
+-        FreeBSD = 11
++        FreeBSD = 11,
++        Rocky = 12,
+     }
+ }
+diff --git a/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/src/installer/Directory.Build.props b/src/dotnet-runtime.478b2f8c0e480665f6c52c95cd57830784dc9560/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
+@@ -172,6 +172,7 @@
+     <TargetsOpensuse>false</TargetsOpensuse>
+     <TargetsFedora>false</TargetsFedora>
+     <TargetsCentos>false</TargetsCentos>
++    <TargetsRocky>false</TargetsRocky>
+     <TargetsOracle>false</TargetsOracle>
+     <TargetsSles>false</TargetsSles>
+     <TargetsBrowser>false</TargetsBrowser>
+@@ -251,6 +252,13 @@
+         <TargetsUnix>true</TargetsUnix>
+       </PropertyGroup>
+     </When>
++    <When Condition="$(OutputRid.StartsWith('rocky'))">
++      <PropertyGroup>
++        <TargetsRocky>true</TargetsRocky>
++        <TargetsLinux>true</TargetsLinux>
++        <TargetsUnix>true</TargetsUnix>
++      </PropertyGroup>
++    </When>
+     <When Condition="$(OutputRid.StartsWith('opensuse'))">
+       <PropertyGroup>
+         <TargetsOpensuse>true</TargetsOpensuse>
+@@ -325,7 +333,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>
+     <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
+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
+@@ -1704,6 +1704,122 @@
+     "any",
+     "base"
+   ],
++  "rocky": [
++    "rocky",
++    "rhel",
++    "linux",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rocky-arm64": [
++    "rocky-arm64",
++    "rocky",
++    "rhel-arm64",
++    "rhel",
++    "linux-arm64",
++    "linux",
++    "unix-arm64",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rocky-x64": [
++    "rocky-x64",
++    "rocky",
++    "rhel-x64",
++    "rhel",
++    "linux-x64",
++    "linux",
++    "unix-x64",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rocky.8": [
++    "rocky.8",
++    "rocky",
++    "rhel.8",
++    "rhel",
++    "linux",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rocky.8-arm64": [
++    "rocky.8-arm64",
++    "rocky.8",
++    "rocky-arm64",
++    "rhel.8-arm64",
++    "rocky",
++    "rhel.8",
++    "rhel-arm64",
++    "rhel",
++    "linux-arm64",
++    "linux",
++    "unix-arm64",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rocky.8-x64": [
++    "rocky.8-x64",
++    "rocky.8",
++    "rocky-x64",
++    "rhel.8-x64",
++    "rocky",
++    "rhel.8",
++    "rhel-x64",
++    "rhel",
++    "linux-x64",
++    "linux",
++    "unix-x64",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rocky.9": [
++    "rocky.9",
++    "rocky",
++    "rhel.9",
++    "rhel",
++    "linux",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rocky.9-arm64": [
++    "rocky.9-arm64",
++    "rocky.9",
++    "rocky-arm64",
++    "rhel.9-arm64",
++    "rocky",
++    "rhel.9",
++    "rhel-arm64",
++    "rhel",
++    "linux-arm64",
++    "linux",
++    "unix-arm64",
++    "unix",
++    "any",
++    "base"
++  ],
++  "rocky.9-x64": [
++    "rocky.9-x64",
++    "rocky.9",
++    "rocky-x64",
++    "rhel.9-x64",
++    "rocky",
++    "rhel.9",
++    "rhel-x64",
++    "rhel",
++    "linux-x64",
++    "linux",
++    "unix-x64",
++    "unix",
++    "any",
++    "base"
++  ],
+   "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
+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
+@@ -601,6 +601,63 @@
+         "rhel.9-x64"
+       ]
+     },
++    "rocky": {
++      "#import": [
++        "rhel"
++      ]
++    },
++    "rocky-arm64": {
++      "#import": [
++        "rocky",
++        "rhel-arm64"
++      ]
++    },
++    "rocky-x64": {
++      "#import": [
++        "rocky",
++        "rhel-x64"
++      ]
++    },
++    "rocky.8": {
++      "#import": [
++        "rocky",
++        "rhel.8"
++      ]
++    },
++    "rocky.8-arm64": {
++      "#import": [
++        "rocky.8",
++        "rocky-arm64",
++        "rhel.8-arm64"
++      ]
++    },
++    "rocky.8-x64": {
++      "#import": [
++        "rocky.8",
++        "rocky-x64",
++        "rhel.8-x64"
++      ]
++    },
++    "rocky.9": {
++      "#import": [
++        "rocky",
++        "rhel.9"
++      ]
++    },
++    "rocky.9-arm64": {
++      "#import": [
++        "rocky.9",
++        "rocky-arm64",
++        "rhel.9-arm64"
++      ]
++    },
++    "rocky.9-x64": {
++      "#import": [
++        "rocky.9",
++        "rocky-x64",
++        "rhel.9-x64"
++      ]
++    },
+     "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
+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
+@@ -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.b8025906f7463b6e477893c81238dc7003b353a3/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs b/src/dotnet-sdk.b8025906f7463b6e477893c81238dc7003b353a3/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
+@@ -15,6 +15,7 @@ public enum BuildPlatform
+         Debian = 8,
+         Fedora = 9,
+         OpenSuse = 10,
+-        FreeBSD = 11
++        FreeBSD = 11,
++        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": {
+             "#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": {
+             "#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": {
+       "#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": {
+       "#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)
+

SPECS/dotnet5.0.spec

@@ -52,11 +52,11 @@
 %global runtime_arch arm64
 %endif
 
-%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID%%.*}")-%{runtime_arch}}
+%{!?runtime_id:%global runtime_id %(. /etc/os-release ; echo "${ID}.${VERSION_ID}")-%{runtime_arch}}
 
 Name:                 dotnet5.0
 Version:              %{sdk_rpm_version}
-Release:              1%{?dist}.rocky.2
+Release:              1%{?dist}.rocky
 Summary:              .NET Runtime and SDK
 License:              MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:                  https://github.com/dotnet/
@@ -75,7 +75,7 @@ Patch100:             runtime-linker-order.patch
 
 # Disable telemetry by default; make it opt-in
 Patch500:             sdk-telemetry-optout.patch
-Patch501:             core-rocky-rid.patch
+Patch501:             0001-Add-Rocky-Linux-specific-changes.patch
 
 %if 0%{?fedora} > 32 || 0%{?rhel} > 8
 ExclusiveArch:        aarch64 x86_64
@@ -529,9 +529,8 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
-* Tue Jun 01 2021 Louis Abel <label@rockylinux.org> - 5.0.203-1.rocky.2
-- Add Rocky Runtime ID with minor versions
-- Slim patch idea from Michael Young
+* Tue Jun 01 2021 Mustafa Gezen <mustafa@rockylinux.org> - 5.0.203-1.rocky
+- Add Rocky Linux specific changes
 
 * Thu Apr 29 2021 Omair Majid <omajid@redhat.com> - 5.0.203-1
 - Update to .NET SDK 5.0.203 and Runtime 5.0.6