Fix Rider build (#2226)

Author: abrooksv

buildspec/windowsTests.yml

@@ -9,13 +9,13 @@ phases:
   install:
     runtime-versions:
       java: openjdk11
-      dotnet: 2.2
 
     commands:
       - |
         if(-Not($Env:CODE_COV_TOKEN -eq $null)) {
             choco install -y --no-progress codecov
         }
+      - dotnet --list-sdks
 
   build:
     commands:

jetbrains-rider/tst/base/AwsReuseSolutionTestBase.kt

@@ -5,7 +5,11 @@ package base
 
 import com.intellij.ide.GeneralSettings
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.SystemInfo
 import com.jetbrains.rider.test.base.BaseTestWithSolutionBase
+import com.jetbrains.rider.test.base.PrepareTestEnvironment
+import com.jetbrains.rider.test.scriptingApi.setUpCustomToolset
+import com.jetbrains.rider.test.scriptingApi.setUpDotNetCoreCliPath
 import com.jetbrains.rider.test.scriptingApi.useCachedTemplates
 import org.testng.annotations.AfterClass
 import org.testng.annotations.BeforeClass
@@ -42,6 +46,15 @@ abstract class AwsReuseSolutionTestBase : BaseTestWithSolutionBase() {
         allowCustomDotnetRoots()
     }
 
+    @BeforeClass
+    fun setUpBuildToolPath() {
+        if (SystemInfo.isWindows) {
+            PrepareTestEnvironment.dotnetCoreCliPath = "C:\\Program Files\\dotnet\\dotnet.exe"
+            setUpDotNetCoreCliPath(PrepareTestEnvironment.dotnetCoreCliPath)
+            setUpCustomToolset(msBuild)
+        }
+    }
+
     @BeforeClass(alwaysRun = true)
     fun setUpClassSolution() {
         openSolution(getSolutionDirectoryName())

jetbrains-rider/tst/base/RiderTestFrameworkUtils.kt

@@ -10,10 +10,24 @@ import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
 import com.jetbrains.rider.test.base.PrepareTestEnvironment
 import java.io.File
 
+/**
+ * Force us to use 3.1. 2020.1 does not like running against 5.
+ * Format is:
+ * ```
+ * 2.1.811 [C:\Program Files\dotnet\sdk]
+ * 3.1.404 [C:\Program Files\dotnet\sdk]
+ * 5.0.100 [C:\Program Files\dotnet\sdk]
+ * ```
+ *
+ * TODO: This seems like it is not needed with 2020.2+ so look to remove it FIX_WHEN_MIN_IS_202
+ */
 val dotNetSdk by lazy {
-    val output = ExecUtil.execAndGetOutput(GeneralCommandLine("dotnet", "--version"))
+    val output = ExecUtil.execAndGetOutput(GeneralCommandLine("dotnet", "--list-sdks"))
     if (output.exitCode == 0) {
-        "C:\\Program Files\\dotnet\\sdk\\${output.stdout.trim()}".also {
+        // We use version 3.1 due to 2020.1 does not like 5, FIX_WHEN_MIN_IS_202
+        val versions = output.stdoutLines.map { it.split(" ").first() }
+        val v31 = versions.first { it.startsWith("3.1") }
+        "C:\\Program Files\\dotnet\\sdk\\$v31".also {
             println("Using dotnet SDK at $it")
         }
     } else {

jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/completion/DotNetHandlerCompletionTest.kt

@@ -4,11 +4,17 @@
 package software.aws.toolkits.jetbrains.services.lambda.completion
 
 import base.allowCustomDotnetRoots
+import base.msBuild
 import com.intellij.openapi.util.IconLoader
+import com.intellij.openapi.util.SystemInfo
 import com.jetbrains.rdclient.icons.toIdeaIcon
 import com.jetbrains.rider.test.annotations.TestEnvironment
 import com.jetbrains.rider.test.base.BaseTestWithSolution
+import com.jetbrains.rider.test.base.PrepareTestEnvironment
+import com.jetbrains.rider.test.scriptingApi.setUpCustomToolset
+import com.jetbrains.rider.test.scriptingApi.setUpDotNetCoreCliPath
 import org.assertj.core.api.Assertions.assertThat
+import org.testng.annotations.BeforeClass
 import org.testng.annotations.BeforeSuite
 import org.testng.annotations.Test
 import software.aws.toolkits.jetbrains.rider.compatability.IconModel
@@ -25,6 +31,15 @@ class DotNetHandlerCompletionTest : BaseTestWithSolution() {
         allowCustomDotnetRoots()
     }
 
+    @BeforeClass
+    fun setUpBuildToolPath() {
+        if (SystemInfo.isWindows) {
+            PrepareTestEnvironment.dotnetCoreCliPath = "C:\\Program Files\\dotnet\\dotnet.exe"
+            setUpDotNetCoreCliPath(PrepareTestEnvironment.dotnetCoreCliPath)
+            setUpCustomToolset(msBuild)
+        }
+    }
+
     @Test(description = "Check a single handler is show in lookup when one is defined in a project.")
     @TestEnvironment(solution = "SamHelloWorldApp")
     fun testDetermineHandlers_SingleHandler() {