build(262): enable jetbrains-rider for 2026.2 GA

Author: branrin

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -152,14 +152,11 @@ object IdeVersions {
                 )
             ),
             rider = RiderProfile(
-                // Rider 2026.2 is still pre-release (RC1) with a closed-source backend API that shifted; the
-                // jetbrains-rider module is excluded from the 2026.2 build in settings.gradle.kts, so this entry
-                // is currently unused. Re-enable the module and switch to "2026.2" / "2026.2.0" once Rider GAs.
-                sdkVersion = "2026.2-RC1-SNAPSHOT",
+                sdkVersion = "2026.2",
                 bundledPlugins = commonPlugins,
                 netFrameworkTarget = "net472",
-                rdGenVersion = "2026.2.4",
-                nugetVersion = "2026.2.0-eap06"
+                rdGenVersion = "2026.2.5",
+                nugetVersion = "2026.2.0"
             )
         )
     ).associateBy { it.name }

buildSrc/src/main/kotlin/toolkit-intellij-subplugin.gradle.kts

@@ -92,7 +92,23 @@ configurations {
                 exclude(group = "bundledPlugin", module = "org.jetbrains.idea.maven")
                 exclude(group = "bundledPlugin", module = "com.intellij.gradle")
                 exclude(group = "bundledPlugin", module = "com.intellij.properties")
-                exclude(group = "bundledModule")
+                // jcef became a bundled plugin the community/ultimate profiles depend on (2026.2); it leaks
+                // transitively via jetbrains-community testFixtures and can't resolve as IU against the RD/GW SDK
+                exclude(group = "bundledPlugin", module = "com.intellij.modules.jcef")
+                if (project.name.contains("jetbrains-rider")) {
+                    // Rider needs its own RD-flavored bundled modules (declared in its build.gradle.kts for 2026.2)
+                    // on the test classpath, so we can't blanket-exclude the group. Instead drop only the modules
+                    // that leak transitively from jetbrains-community/-core and resolve with IU coordinates.
+                    listOf(
+                        "intellij.platform.collaborationTools",
+                        "intellij.platform.collaborationTools.auth",
+                        "intellij.platform.collaborationTools.auth.base",
+                        "intellij.platform.vcs.dvcs.impl",
+                        "intellij.libraries.microba",
+                    ).forEach { exclude(group = "bundledModule", module = it) }
+                } else {
+                    exclude(group = "bundledModule")
+                }
             }
         }
     }

plugins/toolkit/jetbrains-rider/build.gradle.kts

@@ -78,6 +78,16 @@ dependencies {
             "2025.1, 2025.3" -> {
                 bundledModule("intellij.rider")
             }
+            // 2026.2 split the Rider backend/rd-client APIs (Solution/workspace model, LifetimedProjectComponent,
+            // RdDispatcher, CSharpLanguage, project-model extensions) into productModuleV2 modules that are no longer
+            // on the default compile classpath, so declare them explicitly. Symbols are unchanged from 2026.1.
+            "2026.2" -> {
+                bundledModule("intellij.rider")
+                bundledModule("intellij.rider.rdclient.dotnet")
+                bundledModule("intellij.rider.languages")
+                bundledModule("intellij.rd.client")
+                bundledModule("intellij.rd.client.base")
+            }
         }
     }
 

plugins/toolkit/jetbrains-rider/it-243-261/software/aws/toolkits/jetbrains/utils/GoldFile.kt

@@ -0,0 +1,10 @@
+// Copyright 2026 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.utils
+
+import com.intellij.openapi.project.Project
+import com.jetbrains.rider.projectView.solutionDirectory
+
+// Pre-2026.2: debugProgramAfterAttach's gold-file parameter is a java.io.File.
+internal fun goldFile(project: Project, name: String) = project.solutionDirectory.resolve(name)

plugins/toolkit/jetbrains-rider/it-262+/software/aws/toolkits/jetbrains/utils/GoldFile.kt

@@ -0,0 +1,10 @@
+// Copyright 2026 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.utils
+
+import com.intellij.openapi.project.Project
+import com.jetbrains.rider.projectView.solutionDirectoryPath
+
+// 2026.2+: debugProgramAfterAttach's gold-file parameter is a java.nio.file.Path (was java.io.File before).
+internal fun goldFile(project: Project, name: String) = project.solutionDirectoryPath.resolve(name)

plugins/toolkit/jetbrains-rider/it/software/aws/toolkits/jetbrains/utils/RiderTestUtils.kt

@@ -18,7 +18,6 @@ import com.intellij.xdebugger.XDebugSession
 import com.intellij.xdebugger.XDebuggerManager
 import com.intellij.xdebugger.XDebuggerManagerListener
 import com.jetbrains.rdclient.util.idea.waitAndPump
-import com.jetbrains.rider.projectView.solutionDirectory
 import com.jetbrains.rider.test.scriptingApi.DebugTestExecutionContext
 import com.jetbrains.rider.test.scriptingApi.debugProgramAfterAttach
 import com.jetbrains.rider.test.scriptingApi.dumpFullCurrentData
@@ -103,7 +102,8 @@ fun executeRunConfigurationAndWaitRider(runConfiguration: RunConfiguration, exec
         resumeSession()
     }
 
-    debugProgramAfterAttach(session.get(), runConfiguration.project.solutionDirectory.resolve("expected.gold"), waitAndTest, true)
+    // goldFile() is version-split: debugProgramAfterAttach's gold-file param is File pre-262, Path in 262+
+    debugProgramAfterAttach(session.get(), goldFile(runConfiguration.project, "expected.gold"), waitAndTest, true)
 
     return executionFuture.get()
 }

plugins/toolkit/jetbrains-rider/tst-243-261/base/SolutionFunctionFile.kt

@@ -0,0 +1,12 @@
+// Copyright 2026 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package base
+
+import com.intellij.openapi.project.Project
+import com.jetbrains.rider.projectView.solutionDirectory
+import com.jetbrains.rider.test.scriptingApi.getVirtualFileFromPath
+
+// Pre-2026.2: getVirtualFileFromPath's base-dir parameter is a java.io.File, which is what solutionDirectory returns.
+internal fun solutionFunctionFile(project: Project) =
+    getVirtualFileFromPath("src/HelloWorld/Function.cs", project.solutionDirectory)

plugins/toolkit/jetbrains-rider/tst-262+/base/SolutionFunctionFile.kt

@@ -0,0 +1,12 @@
+// Copyright 2026 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package base
+
+import com.intellij.openapi.project.Project
+import com.jetbrains.rider.projectView.solutionDirectoryPath
+import com.jetbrains.rider.test.scriptingApi.getVirtualFileFromPath
+
+// 2026.2+: getVirtualFileFromPath's base-dir parameter is a java.nio.file.Path (was java.io.File before).
+internal fun solutionFunctionFile(project: Project) =
+    getVirtualFileFromPath("src/HelloWorld/Function.cs", project.solutionDirectoryPath)

plugins/toolkit/jetbrains-rider/tst/base/AwsReuseSolutionTestBase.kt

@@ -3,9 +3,7 @@
 
 package base
 
-import com.jetbrains.rider.projectView.solutionDirectory
 import com.jetbrains.rider.test.debugger.XDebuggerTestHelper
-import com.jetbrains.rider.test.scriptingApi.getVirtualFileFromPath
 /**
  * Base test class that uses the same solution per test class.
  * Solution re-open logic takes time. We can avoid this by using the same solution instance per every test in a class
@@ -20,8 +18,9 @@ abstract class AwsReuseSolutionTestBase : BaseTestWithSolution() {
     // https://github.com/JetBrains/fsharp-support/blob/93ab17493a34a0bc0fd4c70b11adde02f81455c4/rider-fsharp/src/test/kotlin/debugger/AsyncDebuggerTest.kt#L6
     // Unlike our other projects we do not have a document to work with, so there might not be a nice way to do it.
     fun setBreakpoint(line: Int = 15) {
-        // Same as com.jetbrains.rider.test.scriptingApi.toggleBreakpoint, but with the correct base directory
-        XDebuggerTestHelper.toggleBreakpoint(project, getVirtualFileFromPath("src/HelloWorld/Function.cs", project.solutionDirectory), line - 1)
+        // Same as com.jetbrains.rider.test.scriptingApi.toggleBreakpoint, but with the correct base directory.
+        // solutionFunctionFile() is version-split (getVirtualFileFromPath's base-dir param is File pre-262, Path in 262+).
+        XDebuggerTestHelper.toggleBreakpoint(project, solutionFunctionFile(project), line - 1)
     }
 
     override val backendLoadedTimeout = backendStartTimeout

settings.gradle.kts

@@ -176,18 +176,6 @@ file("plugins").listFiles()?.forEach root@ {
                 }
             }
 
-            if (it.name == "jetbrains-rider") {
-                when (providers.gradleProperty("ideProfileName").get()) {
-                    // Rider 2026.2 is still pre-release (RC1) with a closed-source backend API that shifted
-                    // significantly (solution/workspace model, language registration, RdDispatcher, etc.) -
-                    // deferred to a follow-up PR once the API stabilizes at GA. Other 2026.2 flavors (IU/IC)
-                    // already compile cleanly.
-                    "2026.2" -> {
-                        return@forEach
-                    }
-                }
-            }
-
             val projectName = path.joinToString(separator = ":", prefix = ":")
             include(projectName)
             project(projectName).projectDir = it