Commit 5a730694 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet5.0-5.0.205-1.el8_4

parent 08d9564b
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
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-installer.64a0cf25eb840995b3a0bf7491e214581edaa77c/src/core-sdk-tasks/Enumerations/BuildPlatform.cs 2021-07-15 22:39:52.551272540 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
......@@ -12,7 +12,7 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-installer.64a0cf25eb840995b3a0bf
}
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
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/installer/Directory.Build.props 2021-07-15 22:42:17.514180581 -0700
@@ -172,6 +172,7 @@
<TargetsOpensuse>false</TargetsOpensuse>
<TargetsFedora>false</TargetsFedora>
......@@ -40,13 +40,13 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb
<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 '$(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>
+ <InstallerExtension Condition="'$(TargetsRhel)' == 'true' or '$(TargetsCentos)' == 'true' or '$(TargetsRocky)' == 'true' or '$(TargetsOpensuse)' == '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 -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
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-07-15 23:34:16.751781687 -0700
@@ -1704,6 +1704,122 @@
"any",
"base"
......@@ -179,7 +179,7 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb
+}
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
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-07-15 23:36:47.516676048 -0700
@@ -50,6 +50,14 @@
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>
......@@ -197,7 +197,7 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb
<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
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-runtime.35964c9215613d66a687ebcb2d7fcd9496390ee7/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-07-15 23:35:49.367945408 -0700
@@ -601,6 +601,63 @@
"rhel.9-x64"
]
......@@ -271,7 +271,7 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-runtime.35964c9215613d66a687ebcb
+}
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
+++ dotnet-v5.0.205-SDK-mod/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1aff1de873391f1/src/Layout/toolset-tasks/Enumerations/BuildPlatform.cs 2021-07-15 23:37:19.695080373 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
......@@ -283,7 +283,7 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/dotnet-sdk.845a58cbb84d076bdcc3ea9ae1af
}
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
+++ dotnet-v5.0.205-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/compiler/resources/runtime.json 2021-07-16 00:17:36.083360096 -0700
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
......@@ -314,7 +314,7 @@ diff -Naurp dotnet-v5.0.205-SDK-orig/src/nuget.client.d525b0e670f3b6cbd5c73a35f0
},
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
+++ dotnet-v5.0.205-SDK-mod/src/nuget.client.d525b0e670f3b6cbd5c73a35f04730a9f658c852/test/TestUtilities/Test.Utility/compiler/resources/runtime.json 2021-07-15 23:42:32.940016313 -0700
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
......
......@@ -52,7 +52,7 @@
%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}
......@@ -531,7 +531,7 @@ echo "Testing build results for debug symbols..."
%changelog
* Thu Jul 15 2021 Mustafa Gezen <mustafa@rockylinux.org> - 5.0.205-1.rocky
* Fri Jul 16 2021 Mustafa Gezen <mustafa@rockylinux.org> - 5.0.205-1.rocky
- Add Rocky Linux specific changes
* Thu Jul 08 2021 Andrew Slice <andrew.slice@redhat.com> - 5.0.205-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