Skip to content

Commit 93bca3b

Browse files
authored
Fix win dotnet tooling too new (#3153)
1 parent 138d262 commit 93bca3b

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,33 @@ package software.aws.toolkits.jetbrains.services.lambda.completion
55

66
import base.allowCustomDotnetRoots
77
import base.backendStartTimeout
8+
import base.msBuild
9+
import base.setUpCustomToolset
10+
import com.intellij.openapi.application.ApplicationManager
811
import com.intellij.openapi.util.IconLoader
912
import com.jetbrains.rd.ide.model.IconModel
1013
import com.jetbrains.rider.test.annotations.TestEnvironment
1114
import com.jetbrains.rider.test.base.BaseTestWithSolution
15+
import com.jetbrains.rider.test.protocol.testProtocolHost
1216
import org.assertj.core.api.Assertions.assertThat
1317
import org.testng.annotations.BeforeSuite
1418
import org.testng.annotations.Test
1519
import java.time.Duration
1620

1721
class DotNetHandlerCompletionTest : BaseTestWithSolution() {
22+
// FIX_WHEN_MIN_IS_212: backendShellLoadedTimeout is the one we actually need to override
1823
override val backendLoadedTimeout: Duration = backendStartTimeout
1924

2025
override fun getSolutionDirectoryName(): String = ""
2126

2227
override val waitForCaches = true
2328

29+
@BeforeSuite
30+
fun setMsBuildVersion() {
31+
val host = ApplicationManager.getApplication().testProtocolHost
32+
setUpCustomToolset(msBuild, host)
33+
}
34+
2435
// TODO: Remove when https://youtrack.jetbrains.com/issue/RIDER-47995 is fixed FIX_WHEN_MIN_IS_203
2536
@BeforeSuite
2637
fun allowDotnetRoots() {

jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/dotnet/LambdaGutterMarkHighlightingTest.kt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@
44
package software.aws.toolkits.jetbrains.services.lambda.dotnet
55

66
import base.backendStartTimeout
7+
import base.msBuild
8+
import base.setUpCustomToolset
9+
import com.intellij.openapi.application.ApplicationManager
710
import com.jetbrains.rdclient.testFramework.waitForDaemon
811
import com.jetbrains.rider.projectView.solution
912
import com.jetbrains.rider.test.base.BaseTestWithMarkup
13+
import com.jetbrains.rider.test.protocol.testProtocolHost
14+
import org.testng.annotations.BeforeSuite
1015
import org.testng.annotations.DataProvider
1116
import org.testng.annotations.Test
1217
import software.aws.toolkits.jetbrains.protocol.awsSettingModel
@@ -18,6 +23,13 @@ class LambdaGutterMarkHighlightingTest : BaseTestWithMarkup() {
1823
private const val LAMBDA_RUN_MARKER_ATTRIBUTE_ID = "AWS Lambda Run Method Gutter Mark"
1924
}
2025

26+
@BeforeSuite
27+
fun setMsBuildVersion() {
28+
val host = ApplicationManager.getApplication().testProtocolHost
29+
setUpCustomToolset(msBuild, host)
30+
}
31+
32+
// FIX_WHEN_MIN_IS_212: backendShellLoadedTimeout is the one we actually need to override
2133
override val backendLoadedTimeout: Duration = backendStartTimeout
2234

2335
override fun getSolutionDirectoryName(): String = "SamHelloWorldApp"

0 commit comments

Comments
 (0)