From 3d7ddc36f5331bfd4d7a24aaed7c4cdc161e4f06 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Jan 2026 11:19:36 +0000 Subject: [PATCH 1/5] Dependencies: update IntelliJ-based IDE versions --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 46c081f..58d3676 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,10 +18,10 @@ BuildConfiguration=Debug # Release: 2020.2 # EAP: 2020.3-EAP2-SNAPSHOT # Nightly: 2020.3-SNAPSHOT -ProductVersion=2025.3 +ProductVersion=2026.1-SNAPSHOT # Plugin Verification IDE Version -pluginVerificationIdeVersion=2025.3 +pluginVerificationIdeVersion=2026.1-SNAPSHOT # 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 From 1d52458d51ac8159d96aca56d3fe63a6950e3cf3 Mon Sep 17 00:00:00 2001 From: smolchanovsky Date: Thu, 15 Jan 2026 13:58:30 +0400 Subject: [PATCH 2/5] Update Kotlin version --- build.gradle.kts | 8 ++++++-- gradle/libs.versions.toml | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3c6d6a4..17025cd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -69,11 +69,15 @@ sourceSets { } tasks.compileKotlin { - kotlinOptions { jvmTarget = "21" } + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21) + } } tasks.compileTestKotlin { - kotlinOptions { jvmTarget = "21" } + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_21) + } } tasks.test { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 44aa6b7..c21a89a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -kotlin = "2.1.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library +kotlin = "2.3.0" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library rdGen = "2025.3.1" # https://github.com/JetBrains/rd/releases changelog = "2.5.0" # https://github.com/JetBrains/gradle-changelog-plugin/releases From 84b53b01a0203a19ce1bc756b249aaa5e20df408 Mon Sep 17 00:00:00 2001 From: smolchanovsky Date: Thu, 15 Jan 2026 20:06:55 +0400 Subject: [PATCH 3/5] Fix DotNetCliExePath --- .../JitDisasmAdapters/JitDisasmProjectContextFactory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmProjectContextFactory.cs b/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmProjectContextFactory.cs index 0a72732..385b6a1 100644 --- a/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmProjectContextFactory.cs +++ b/src/dotnet/ReSharperPlugin.DotNetDisassembler/JitDisasmAdapters/JitDisasmProjectContextFactory.cs @@ -36,6 +36,6 @@ private static string GetDotNetCliExePath(ISolution solution) var protocolSolution = solution.GetProtocolSolution(); var runtimeModel = protocolSolution.GetDotNetActiveRuntimeModel(); var activeRuntime = runtimeModel.ActiveRuntime.Maybe.ValueOrDefault; - return activeRuntime?.DotNetCliExePath; + return activeRuntime?.DotNetCliExePath?.Value ?? "dotnet"; } } From 303f68f6c5b0b149e56282390d425413dfba10ef Mon Sep 17 00:00:00 2001 From: smolchanovsky Date: Mon, 19 Jan 2026 15:17:42 +0400 Subject: [PATCH 4/5] Update pluginSinceBuild --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 58d3676..8d5293a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ RiderPluginId=com.jetbrains.rider.plugins.dotnetdisassembler PluginRepositoryUrl=https://github.com/JetBrains/dotnet-disassembler-plugin PluginVersion=0.1.1 -pluginSinceBuild=253 +pluginSinceBuild=261 BuildConfiguration=Debug From 7f3aa98247ef409b46f94ab96851144b04b967c8 Mon Sep 17 00:00:00 2001 From: smolchanovsky Date: Mon, 19 Jan 2026 16:00:38 +0400 Subject: [PATCH 5/5] Specify ide type for verification --- build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 17025cd..4a33812 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,7 @@ import com.jetbrains.plugin.structure.base.utils.isFile import org.jetbrains.changelog.markdownToHTML import org.jetbrains.intellij.platform.gradle.Constants +import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType import kotlin.io.path.absolute import kotlin.io.path.isDirectory @@ -182,7 +183,7 @@ dependencies { intellijPlatform { pluginVerification { ides { - recommended() + create(IntelliJPlatformType.Rider, ProductVersion) } }