Update to Rider 2026.1 (#312)

* chore: update Rider SDK to 2026.1

* chore: update Kotlin to 2.3.20 and rd-gen to 2026.1.3

* chore: update IntelliJ Platform plugin to 2.13.1 and Gradle to 8.13

* chore: update Gradle wrapper to 9.4.1 and fix Gradle 9 compatibility

IntelliJ Platform Gradle Plugin 2.13.1 requires Gradle 9.0+.
Replace removed exec {} in task actions with injected ExecOperations.
Replace deprecated buildDir with layout.buildDirectory.

* chore: update ReSharper SDK to 2026.1.0

* chore: update Microsoft.CodeAnalysis.NetAnalyzers to 10.0.104

* chore: update CI .NET SDK from 6.x to 8.x

.NET 6 is EOL. Update to .NET 8 LTS for building with ReSharper SDK 2026.1.

* fix: add Gradle 9 toolchain resolver and update rd-gen imports

Add foojay-resolver-convention plugin for JDK auto-provisioning.
Update rd-gen model imports from com.jetbrains.rider.generator.nova
to com.jetbrains.rd.generator.nova (renamed in rd-gen 2026.1.3).

* chore: improve CI pipeline

- Rename workflow to 'Build & Publish'
- Add concurrency group to cancel superseded runs
- Fix cache key to use correct path for gradle-wrapper.properties
  and include libs.versions.toml and build.gradle.kts
- Add restore-keys fallback for partial cache hits
- Update upload-artifact from v4.3.3 to v4
- Remove unnecessary cmd shell from publish step

* chore: use gradle/actions/setup-gradle for better caching

Replace manual Gradle cache with official setup-gradle action which
handles wrapper, dependency, and build cache automatically.
Add --build-cache flag to reuse task outputs across runs.
Keep separate NuGet cache since setup-gradle doesn't cover that.

* chore: pin gradle/actions/setup-gradle to full commit SHA

* fix: pass publish secret via env var instead of inline expansion

Avoids expanding secrets directly in run blocks (githubactions:S7636).

Author: MO2k4

.github/workflows/main.yml

@@ -1,4 +1,4 @@
-name: Create 
+name: Build & Publish
 
 on:
   push:
@@ -8,6 +8,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: windows-latest
@@ -16,33 +20,34 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install .NET 6 SDK
+      - name: Install .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '6.x'
+          dotnet-version: '8.x'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@0b6dd653ba04f4f93bf581ec31e66cbd7dcb644d # v4
 
-      - uses: actions/cache@v4
+      - name: Cache NuGet packages
+        uses: actions/cache@v4
         with:
-          path: |
-            build/gradle-jvm
-            ~/.nuget/packages
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-Build-${{ hashFiles('gradlew.bat', 'src/dotnet/*/*.csproj', 'src/dotnet/*.props', 'gradle-wrapper.properties') }}
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('src/dotnet/*/*.csproj', 'src/dotnet/*.props') }}
+          restore-keys: |
+            ${{ runner.os }}-nuget-
 
       - name: Build Plugin
-        run: ./gradlew buildPlugin
+        run: ./gradlew buildPlugin --build-cache
 
       - name: Publish Artifact
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: output
           retention-days: 7
-      
+
       - name: Publish plugins to jetbrains
-        shell: cmd
-        run: ./gradlew publishPlugin -PBuildConfiguration="Release" -PPublishToken="%PublishKey%"
+        run: ./gradlew publishPlugin -PBuildConfiguration="Release" -PPublishToken="$PUBLISH_KEY" --build-cache
         env:
-          PublishKey: ${{ secrets.PublishKey }}
-        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'
+          PUBLISH_KEY: ${{ secrets.PublishKey }}
+        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/master'

build.gradle.kts

@@ -1,19 +1,27 @@
 import com.jetbrains.plugin.structure.base.utils.isFile
 import groovy.ant.FileNameFinder
 import org.apache.tools.ant.taskdefs.condition.Os
+import org.gradle.process.ExecOperations
 import org.jetbrains.intellij.platform.gradle.Constants
 import java.io.ByteArrayOutputStream
+import javax.inject.Inject
 
 plugins {
     id("java")
     alias(libs.plugins.kotlinJvm)
-    id("org.jetbrains.intellij.platform") version "2.8.0"     // See https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
+    id("org.jetbrains.intellij.platform") version "2.13.1"    // See https://github.com/JetBrains/intellij-platform-gradle-plugin/releases
     id("me.filippov.gradle.jvm.wrapper") version "0.15.0"
 }
 
 val isWindows = Os.isFamily(Os.FAMILY_WINDOWS)
 extra["isWindows"] = isWindows
 
+// Gradle 9 removed exec {} from task actions; use injected ExecOperations instead
+interface Injected {
+    @get:Inject val execOps: ExecOperations
+}
+val injected = objects.newInstance<Injected>()
+
 val DotnetSolution: String by project
 val BuildConfiguration: String by project
 val ProductVersion: String by project
@@ -35,7 +43,7 @@ repositories {
 }
 
 tasks.wrapper {
-    gradleVersion = "8.8"
+    gradleVersion = "9.4.1"
     distributionType = Wrapper.DistributionType.ALL
     distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
 }
@@ -73,7 +81,7 @@ val setBuildTool by tasks.registering {
 
         if (isWindows) {
             val stdout = ByteArrayOutputStream()
-            exec {
+            injected.execOps.exec {
                 executable("${rootDir}\\tools\\vswhere.exe")
                 args("-latest", "-property", "installationPath", "-products", "*")
                 standardOutput = stdout
@@ -102,7 +110,7 @@ val compileDotNet by tasks.registering {
         val arguments = (setBuildTool.get().extra["args"] as List<String>).toMutableList()
         arguments.add("/t:Restore;Rebuild")
 
-        exec {
+        injected.execOps.exec {
             executable(executable)
             args(arguments)
             workingDir(rootDir)
@@ -112,7 +120,7 @@ val compileDotNet by tasks.registering {
 
 val testDotNet by tasks.registering {
     doLast {
-        exec {
+        injected.execOps.exec {
             executable("dotnet")
             args("test", DotnetSolution,"--logger","GitHubActions")
             workingDir(rootDir)
@@ -123,7 +131,7 @@ val testDotNet by tasks.registering {
 tasks.buildPlugin {
     doLast {
         copy {
-            from("${buildDir}/distributions/${rootProject.name}-${version}.zip")
+            from("${layout.buildDirectory.get().asFile}/distributions/${rootProject.name}-${version}.zip")
             into("${rootDir}/output")
         }
 
@@ -141,7 +149,7 @@ tasks.buildPlugin {
         arguments.add("/p:PackageReleaseNotes=${changeNotes}")
         arguments.add("/p:PackageVersion=${version}")
 
-        exec {
+        injected.execOps.exec {
             executable(executable)
             args(arguments)
             workingDir(rootDir)
@@ -207,7 +215,7 @@ tasks.publishPlugin {
     token.set(PublishToken)
 
     doLast {
-        exec {
+        injected.execOps.exec {
             executable("dotnet")
             args("nuget","push","output/${DotnetPluginId}.${version}.nupkg","--api-key", PublishToken,"--source","https://plugins.jetbrains.com")
             workingDir(rootDir)

gradle.properties

@@ -15,8 +15,8 @@ PublishToken="_PLACEHOLDER_"
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-ProductVersion=2025.3
-PluginVersion=2025.3.0
+ProductVersion=2026.1
+PluginVersion=2026.1.0
 
 # Kotlin 1.4 will bundle the stdlib dependency by default, causing problems with the version bundled with the IDE
 # https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-rc-released/#stdlib-default

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-kotlin = "2.2.21" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
-rdGen = "2025.3.1" # https://github.com/JetBrains/rd/releases
+kotlin = "2.3.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
+rdGen = "2026.1.3" # https://github.com/JetBrains/rd/releases
 
 [libraries]
 kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.jar

@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.8-all.zip
+distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-9.4.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,8 @@
 package model.rider
 
 import com.jetbrains.rider.model.nova.ide.SolutionModel
-import com.jetbrains.rider.generator.nova.*
-import com.jetbrains.rider.generator.nova.PredefinedType.*
+import com.jetbrains.rd.generator.nova.*
+import com.jetbrains.rd.generator.nova.PredefinedType.*
 
 @Suppress("unused")
 object CleanCodeModel : Ext(SolutionModel.Solution) {

gradlew

@@ -17,6 +17,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
+}
+
 rootProject.name = "cleancode"
 
 include(":protocol")