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-16 10:02:57.744798538 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
OpenSuse = 10,
- FreeBSD = 11
+ FreeBSD = 11,
+ Rocky = 12,
}
}
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-16 10:04:58.230362584 -0700
@@ -172,6 +172,7 @@
false
false
false
+ false
false
false
false
@@ -252,6 +253,13 @@
true
+
+
+ true
+ true
+ true
+
+
true
@@ -333,7 +341,7 @@
.msi
.pkg
.deb
- .rpm
+ .rpm
.exe
$(InstallerExtension)
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-16 10:07:04.485001518 -0700
@@ -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",
@@ -7032,4 +7148,4 @@
"any",
"base"
]
-}
\ No newline at end of file
+}
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-16 10:08:39.145230331 -0700
@@ -50,6 +50,14 @@
false
+
+ rhel
+ x64;arm64
+ 8;9
+ true
+ false
+
+
linux
x64;x86;arm;armel;arm64
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-16 10:07:28.753316557 -0700
@@ -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"
@@ -3121,4 +3178,4 @@
]
}
}
-}
\ No newline at end of file
+}
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-16 10:03:11.653979093 -0700
@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Cli.Build.Fra
Debian = 8,
Fedora = 9,
OpenSuse = 10,
- FreeBSD = 11
+ FreeBSD = 11,
+ Rocky = 12,
}
}
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-16 10:09:36.657976935 -0700
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
+ "rocky": {
+ "#import": [ "rhel" ]
+ },
+ "rocky-x64": {
+ "#import": [ "rocky", "rhel-x64" ]
+ },
+
"debian": {
"#import": [ "linux" ]
},
@@ -778,6 +785,13 @@
"#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 -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-16 10:10:24.543598553 -0700
@@ -332,6 +332,13 @@
"#import": [ "centos.7", "centos-x64", "rhel.7-x64" ]
},
+ "rocky": {
+ "#import": [ "rhel" ]
+ },
+ "rocky-x64": {
+ "#import": [ "rocky", "rhel-x64" ]
+ },
+
"debian": {
"#import": [ "linux" ]
},
@@ -778,6 +785,13 @@
"#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" ]
},