diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-coreclr.bb01933c496758887ca03572c8e2a16a82a1779a/init-distro-rid.sh dotnet-v3.1.119-SDK/src/dotnet-coreclr.bb01933c496758887ca03572c8e2a16a82a1779a/init-distro-rid.sh --- dotnet-v3.1.119-SDK-orig/src/dotnet-coreclr.bb01933c496758887ca03572c8e2a16a82a1779a/init-distro-rid.sh 2021-07-29 11:51:27.000000000 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-coreclr.bb01933c496758887ca03572c8e2a16a82a1779a/init-distro-rid.sh 2021-08-11 16:09:37.673740318 -0700 @@ -51,7 +51,7 @@ initNonPortableDistroRid() # We have forced __PortableBuild=0. This is because -portablebuld # has been passed as false. if (( ${isPortable} == 0 )); then - if [ "${ID}" == "rhel" ]; then + if [ "${ID}" == "rhel" ] || [ "${ID}" == "rocky" ]; then # remove the last version digit VERSION_ID=${VERSION_ID%.*} fi @@ -185,4 +185,4 @@ initDistroRidGlobal() export __RuntimeId=${__DistroRid} fi -} \ No newline at end of file +} diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json --- dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-07-29 11:51:44.000000000 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-08-11 16:12:33.225921253 -0700 @@ -3204,6 +3204,75 @@ "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.4": [ + "rocky.8.4", + "rocky", + "rhel", + "linux", + "unix", + "any", + "base" + ], + "rocky.8.4-arm64": [ + "rocky.8.4-arm64", + "rocky.8.4", + "rocky-arm64", + "rocky", + "rhel-arm64", + "rhel", + "linux-arm64", + "linux", + "unix-arm64", + "unix", + "any", + "base" + ], + "rocky.8.4-x64": [ + "rocky.8.4-x64", + "rocky.8.4", + "rocky-x64", + "rocky", + "rhel-x64", + "rhel", + "linux-x64", + "linux", + "unix-x64", + "unix", + "any", + "base" + ], "sles": [ "sles", "linux", @@ -5225,4 +5294,4 @@ "any", "base" ] -} \ No newline at end of file +} diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props --- dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-07-29 11:51:44.000000000 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-08-11 16:13:16.146454465 -0700 @@ -137,6 +137,12 @@ 9 + + rhel + x64;arm64 + 8.4 + + linux x64 diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.json --- dotnet-v3.1.119-SDK-orig/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-07-29 11:51:44.000000000 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-corefx.7711b939317ae5cb3ffa4f19a39119876aafd30e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-08-11 16:13:54.429930073 -0700 @@ -1428,6 +1428,40 @@ "rhel-x64" ] }, + "rocky": { + "#import": [ + "rhel" + ] + }, + "rocky-arm64": { + "#import": [ + "rocky", + "rhel-arm64" + ] + }, + "rocky-x64": { + "#import": [ + "rocky", + "rhel-x64" + ] + }, + "rocky.8.4": { + "#import": [ + "rocky" + ] + }, + "rocky.8.4-arm64": { + "#import": [ + "rocky.8.4", + "rocky-arm64" + ] + }, + "rocky.8.4-x64": { + "#import": [ + "rocky.8.4", + "rocky-x64" + ] + }, "sles": { "#import": [ "linux" @@ -2390,4 +2424,4 @@ ] } } -} \ No newline at end of file +} diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/build.sh dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/build.sh --- dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/build.sh 2021-07-29 11:51:50.000000000 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/build.sh 2021-08-11 16:14:31.400389369 -0700 @@ -21,7 +21,7 @@ init_rid_plat() __rid_plat="" if [ -e /etc/os-release ]; then source /etc/os-release - if [[ "$ID" == "rhel" ]]; then + if [[ "$ID" == "rhel" ]] || [[ "$ID" == "rocky" ]]; then # remove the last version number VERSION_ID=${VERSION_ID%.*} fi diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/common/pal.unix.cpp dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/common/pal.unix.cpp --- dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/common/pal.unix.cpp 2021-07-29 11:51:50.000000000 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/corehost/common/pal.unix.cpp 2021-08-11 16:15:47.296332247 -0700 @@ -496,6 +496,7 @@ pal::string_t normalize_linux_rid(pal::s { pal::string_t rhelPrefix(_X("rhel.")); pal::string_t alpinePrefix(_X("alpine.")); + pal::string_t rockyPrefix(_X("rocky.")); size_t lastVersionSeparatorIndex = std::string::npos; if (rid.compare(0, rhelPrefix.length(), rhelPrefix) == 0) @@ -510,6 +511,10 @@ pal::string_t normalize_linux_rid(pal::s lastVersionSeparatorIndex = rid.find(_X("."), secondVersionSeparatorIndex + 1); } } + else if (rid.compare(0, rockyPrefix.length(), rockyPrefix) == 0) + { + lastVersionSeparatorIndex = rid.find(_X("."), rockyPrefix.length()); + } if (lastVersionSeparatorIndex != std::string::npos) { diff -Naurp dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs --- dotnet-v3.1.119-SDK-orig/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-07-29 11:51:50.000000000 -0700 +++ dotnet-v3.1.119-SDK/src/dotnet-core-setup.aae002469c4fe298a532e11faa01378048840aa9/src/managed/Microsoft.DotNet.PlatformAbstractions/Native/PlatformApis.cs 2021-08-11 16:16:25.319804622 -0700 @@ -181,7 +181,7 @@ namespace Microsoft.DotNet.PlatformAbstr lastVersionNumberSeparatorIndex = distroInfo.VersionId.IndexOf('.', lastVersionNumberSeparatorIndex + 1); } - if (lastVersionNumberSeparatorIndex != -1 && (distroInfo.Id == "rhel" || distroInfo.Id == "alpine")) + if (lastVersionNumberSeparatorIndex != -1 && (distroInfo.Id == "rhel" || distroInfo.Id == "alpine" || distroInfo.Id == "rocky")) { distroInfo.VersionId = distroInfo.VersionId.Substring(0, lastVersionNumberSeparatorIndex); }