Move .NET 6 SDK hack from buildspec to test base (#3095)

Author: rli

buildspec/linuxIntegrationTests.yml

@@ -19,10 +19,7 @@ phases:
       - export DOCKER_USERNAME=`echo $DOCKER_HUB_TOKEN | jq -r '.username'`
       - export DOCKER_PASSWORD=`echo $DOCKER_HUB_TOKEN | jq -r '.password'`
       - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD || true
-      - |
-        if [ "$ALTERNATIVE_IDE_PROFILE_NAME" != "2021.1" ]; then
-            DOTNET_ROOT="/root/.dotnet" /usr/local/bin/dotnet-install.sh --channel 6.0
-        fi
+      - DOTNET_ROOT="/root/.dotnet" /usr/local/bin/dotnet-install.sh --channel 6.0
 
   build:
     commands:

jetbrains-rider/tst-211-213/base/setUpCustomToolset.kt

@@ -0,0 +1,10 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package base
+
+import com.jetbrains.rider.test.scriptingApi.setUpCustomToolset
+
+// FIX_WHEN_MIN_IS_221: signature changed in 221
+fun setUpCustomToolset(path: String, host: com.jetbrains.rdclient.protocol.IProtocolHost) =
+    setUpCustomToolset(path)

jetbrains-rider/tst-221+/base/setUpCustomToolset.kt

@@ -0,0 +1,10 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package base
+
+import com.jetbrains.rider.test.scriptingApi.setUpCustomToolset
+
+// FIX_WHEN_MIN_IS_221: signature changed in 221
+fun setUpCustomToolset(path: String, host: com.jetbrains.rdclient.protocol.IProtocolHost) =
+    setUpCustomToolset(path, host)

jetbrains-rider/tst/base/AwsReuseSolutionTestBase.kt

@@ -4,10 +4,12 @@
 package base
 
 import com.intellij.ide.GeneralSettings
+import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.project.Project
 import com.jetbrains.rider.projectView.solutionDirectory
 import com.jetbrains.rider.test.base.BaseTestWithSolutionBase
 import com.jetbrains.rider.test.debugger.XDebuggerTestHelper
+import com.jetbrains.rider.test.protocol.testProtocolHost
 import com.jetbrains.rider.test.scriptingApi.getVirtualFileFromPath
 import com.jetbrains.rider.test.scriptingApi.useCachedTemplates
 import org.testng.annotations.AfterClass
@@ -47,6 +49,8 @@ abstract class AwsReuseSolutionTestBase : BaseTestWithSolutionBase() {
 
     @BeforeClass(alwaysRun = true)
     fun setUpClassSolution() {
+        val host = ApplicationManager.getApplication().testProtocolHost
+        setUpCustomToolset(msBuild, host)
         openSolution(getSolutionDirectoryName())
     }
 

jetbrains-rider/tst/base/RiderTestFrameworkUtils.kt

@@ -5,24 +5,51 @@ package base
 
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.execution.util.ExecUtil
+import com.intellij.openapi.application.ApplicationInfo
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
+import com.intellij.util.text.SemVer
 import com.jetbrains.rider.test.base.PrepareTestEnvironment
 import java.io.File
+import java.nio.file.Paths
 
-val dotNetSdk by lazy {
-    val output = ExecUtil.execAndGetOutput(GeneralCommandLine("dotnet", "--version"))
-    if (output.exitCode == 0) {
-        "C:\\Program Files\\dotnet\\sdk\\${output.stdout.trim()}".also {
-            println("Using dotnet SDK at $it")
-        }
-    } else {
+val versions by lazy {
+    // would be nice if this were json https://github.com/dotnet/runtime/issues/3049
+    val output = ExecUtil.execAndGetOutput(GeneralCommandLine("dotnet", "--list-sdks"))
+    if (output.exitCode != 0) {
         throw IllegalStateException("Failed to locate dotnet version: ${output.stderr}")
     }
+
+    output.stdout.trim().lines().map {
+        val (version, path) = it.split(' ', limit = 2)
+        val sdkSemVer = SemVer.parseFromText(version) ?: throw RuntimeException("Could not parse .NET SDK version as SemVar: $version")
+        sdkSemVer to path.trim('[', ']')
+    }.sortedByDescending { it.first }
+}
+
+val dotNetSdk by lazy {
+    val version = ApplicationInfo.getInstance().build.baselineVersion
+
+    val sdk = when {
+        // FIX_WHEN_MIN_IS_212: Rider is not aware of .NET 6.0 until 212
+        version < 212 ->
+            versions.firstOrNull { it.first.major < 6 }
+                ?: throw RuntimeException("Current IDE profile '$version' requires .NET < 6, but only found: $versions")
+        // otherwise use latest
+        else -> versions.first()
+    }
+
+    val (sdkVersion, sdkRoot) = sdk
+    val sdkVersionFolder = sdkVersion.rawVersion
+    val sdkPath = Paths.get(sdkRoot, sdkVersionFolder).toAbsolutePath().toString()
+
+    println("Using .NET SDK '$sdkVersionFolder' at path: '$sdkPath'")
+
+    return@lazy sdkPath
 }
 
 val msBuild by lazy {
-    "${dotNetSdk}\\MSBuild.dll"
+    Paths.get(dotNetSdk, "MSBuild.dll").toAbsolutePath().toString()
 }
 
 // TODO: Remove when https://youtrack.jetbrains.com/issue/RIDER-47995 is fixed FIX_WHEN_MIN_IS_212