ResolveReadyToRunCompilers: map non-portable rids when targetOS is de…

…termined.
dotnet · Oct 7, 2022 · 44ab0e6 · 44ab0e6
1 parent f720423
commit 44ab0e6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh
@@ -21,10 +21,10 @@ function InitializeCustomSDKToolset {
 
   InitializeDotNetCli true
 
-  if [[ "$DISTRO" != "ubuntu" || "$MAJOR_VERSION" -le 16 ]]; then
-    InstallDotNetSharedFramework "1.0.5"
-    InstallDotNetSharedFramework "1.1.2"
-  fi
+  # if [[ "$DISTRO" != "ubuntu" || "$MAJOR_VERSION" -le 16 ]]; then
+    # InstallDotNetSharedFramework "1.0.5"
+    # InstallDotNetSharedFramework "1.1.2"
+  # fi
   InstallDotNetSharedFramework "2.1.0"
   InstallDotNetSharedFramework "2.2.8"
   InstallDotNetSharedFramework "3.1.0"

diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs
@@ -143,7 +143,15 @@ private bool ValidateCrossgen2Support()
 
             bool version5 = crossgen2PackVersion.Major < 6;
             bool isSupportedTarget = ExtractTargetPlatformAndArchitecture(_targetRuntimeIdentifier, out _targetPlatform, out _targetArchitecture);
-            string targetOS = _targetPlatform switch
+
+            var runtimeGraph = new RuntimeGraphCache(this).GetRuntimeGraph(RuntimeGraphPath);
+            string portablePlatform = NuGetUtils.GetBestMatchingRid(
+                    runtimeGraph,
+                    _targetPlatform,
+                    new[] { "linux", "linux-musl", "osx", "win" },
+                    out _);
+
+            string targetOS = portablePlatform switch
             {
                 "linux" => "linux",
                 "linux-musl" => "linux",