diff --git a/.gitignore b/.gitignore
index c624fc6..d3613a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,15 @@
-# Common IntelliJ Platform excludes
+/.idea/
+/.gradle/
+/.intellijPlatform/
 
-# User specific
-**/.idea/**/workspace.xml
-**/.idea/**/tasks.xml
-**/.idea/shelf/*
-**/.idea/dictionaries
-**/.idea/httpRequests/
+bin/
+obj/
+build/
 
-# Sensitive or high-churn files
-**/.idea/**/dataSources/
-**/.idea/**/dataSources.ids
-**/.idea/**/dataSources.xml
-**/.idea/**/dataSources.local.xml
-**/.idea/**/sqlDataSources.xml
-**/.idea/**/dynamic.xml
+/src/rider/generated/**/*.Generated.kt
+/src/dotnet/ReSharperPlugin.NSubstituteComplete/Model/**/*.Generated.cs
 
-# Rider
-# Rider auto-generates .iml files, and contentModel.xml
-**/.idea/**/*.iml
-**/.idea/**/contentModel.xml
-**/.idea/**/modules.xml
+/src/dotnet/nuget.config
 
 *.suo
 *.user
diff --git a/.idea/.idea.NSubstituteComplete/.idea/gradle.xml b/.idea/.idea.NSubstituteComplete/.idea/gradle.xml
index 234a27d..299a0b8 100644
--- a/.idea/.idea.NSubstituteComplete/.idea/gradle.xml
+++ b/.idea/.idea.NSubstituteComplete/.idea/gradle.xml
@@ -4,9 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="corretto-11" />
+        <option name="gradleJvm" value="corretto-21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/NSubstituteComplete.sln b/NSubstituteComplete.sln
index 1a2ecd4..3754722 100644
--- a/NSubstituteComplete.sln
+++ b/NSubstituteComplete.sln
@@ -11,7 +11,9 @@ ProjectSection(SolutionItems) = preProject
 	README.md = README.md
 	CHANGELOG.md = CHANGELOG.md
 	gradle.properties = gradle.properties
-	build.gradle = build.gradle
+	build.gradle.kts = build.gradle.kts
+	settings.gradle.kts = settings.gradle.kts
+	gradle\libs.versions.toml = gradle\libs.versions.toml
 EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReSharperPlugin.NSubstituteComplete.Tests", "src\dotnet\ReSharperPlugin.NSubstituteComplete.Tests\ReSharperPlugin.NSubstituteComplete.Tests.csproj", "{01C3DEF5-50B2-47CB-9467-19BC6DDF9D3D}"
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 638a7c6..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,193 +0,0 @@
-// Reference https://www.jetbrains.org/intellij/sdk/docs/tutorials/build_system/gradle_guide.html
-import org.apache.tools.ant.taskdefs.condition.Os
-
-plugins {
-    id 'java'
-    id 'org.jetbrains.kotlin.jvm' version '1.8.22'
-    id 'org.jetbrains.intellij' version '1.17.4'     // https://github.com/JetBrains/gradle-intellij-plugin/releases
-    id 'com.jetbrains.rdgen' version '2024.1.1'          // https://github.com/JetBrains/rd/releases
-}
-
-ext {
-    isWindows = Os.isFamily(Os.FAMILY_WINDOWS)
-    rdLibDirectory = {
-        new File(setupDependencies.idea.get().classes, "lib/rd")
-    }
-}
-
-repositories {
-    maven { url 'https://cache-redirector.jetbrains.com/intellij-repository/snapshots' }
-    maven { url 'https://cache-redirector.jetbrains.com/maven-central' }
-}
-
-wrapper {
-    gradleVersion = '7.1'
-    distributionType = Wrapper.DistributionType.ALL
-    distributionUrl = "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
-}
-
-version = ext.PluginVersion
-
-sourceSets {
-    main {
-        java.srcDir 'src/rider/main/java'
-        kotlin.srcDir 'src/rider/main/kotlin'
-        resources.srcDir 'src/rider/main/resources'
-    }
-}
-
-compileKotlin {
-    kotlinOptions { jvmTarget = "17" }
-}
-
-task setBuildTool {
-    doLast {
-        ext.args = []
-        ByteArrayOutputStream stdout = new ByteArrayOutputStream()
-        if (isWindows) {
-            exec {
-                executable "${rootDir}\\tools\\vswhere.exe"
-                args '-latest','-property','installationPath','-products','*'
-                standardOutput = stdout
-                workingDir rootDir
-            }
-            List<String> files = new FileNameFinder().getFileNames("${stdout.toString().trim()}\\MSBuild", "**/MSBuild.exe")
-            ext.executable = files.get(0)
-            ext.args << "/v:minimal"
-        } else {
-            ext.executable = "dotnet"
-            ext.args << "msbuild"
-        }
-        ext.args << "${DotnetSolution}"
-        ext.args << "/p:Configuration=${BuildConfiguration}"
-        ext.args << "/p:HostFullIdentifier="
-    }
-}
-
-task compileDotNet {
-    dependsOn setBuildTool
-    doLast {
-        def arguments = setBuildTool.args.clone()
-        arguments << "/t:Restore;Rebuild"
-        exec {
-            executable setBuildTool.executable
-            args arguments
-            workingDir rootDir
-        }
-    }
-}
-
-buildPlugin {
-    doLast {
-        copy {
-            from "${buildDir}/distributions/${rootProject.name}-${version}.zip"
-            into "${rootDir}/output"
-        }
-
-        // TODO: See also org.jetbrains.changelog: https://github.com/JetBrains/gradle-changelog-plugin
-        def changelogText = file("${rootDir}/CHANGELOG.md").text
-        def changelogMatches = changelogText =~ /(?s)(-.+?)(?=##|$)/
-        def changeNotes = changelogMatches.collect {
-            it[1].replaceAll(/(?s)- /, "\u2022 ").replaceAll(/`/, "").replaceAll(/,/, "%2C").replaceAll(/;/, "%3B")
-        }.take(1).join("")
-
-        def arguments = setBuildTool.args.clone()
-        arguments << "/t:Pack"
-        arguments << "/p:PackageOutputPath=${rootDir}/output"
-        arguments << "/p:PackageReleaseNotes=${changeNotes}"
-        arguments << "/p:PackageVersion=${version}"
-        exec {
-            executable setBuildTool.executable
-            args arguments
-            workingDir rootDir
-        }
-    }
-}
-
-intellij {
-    type = 'RD'
-    version = "${ProductVersion}"
-    downloadSources = false
-    instrumentCode = false
-    // TODO: add plugins
-    // plugins = ["uml", "com.jetbrains.ChooseRuntime:1.0.9"]
-}
-
-runIde {
-    // Match Rider's default heap size of 1.5Gb (default for runIde is 512Mb)
-    maxHeapSize = "1500m"
-
-    // Rider's backend doesn't support dynamic plugins. It might be possible to work with auto-reload of the frontend
-    // part of a plugin, but there are dangers about keeping plugins in sync
-    autoReloadPlugins = false
-
-    // gradle-intellij-plugin will download the default version of the JBR for the snapshot. Update if required
-    // jbrVersion = "jbr_jcef-11_0_6b765.40" // https://confluence.jetbrains.com/display/JBR/Release+notes
-}
-
-rdgen {
-    def modelDir = new File(rootDir, "protocol/src/main/kotlin/model")
-    def csOutput = new File(rootDir, "src/dotnet/${DotnetPluginId}/Rider")
-    def ktOutput = new File(rootDir, "src/rider/main/kotlin/com/jetbrains/rider/plugins/${RiderPluginId.replace('.','/').toLowerCase()}")
-
-    verbose = true
-    classpath {
-        "${rdLibDirectory()}/rider-model.jar"
-    }
-    sources "${modelDir}/rider"
-    hashFolder = "${buildDir}"
-    packages = "model.rider"
-
-    generator {
-        language = "kotlin"
-        transform = "asis"
-        root = "com.jetbrains.rider.model.nova.ide.IdeRoot"
-        namespace = "com.jetbrains.rider.model"
-        directory = "$ktOutput"
-    }
-
-    generator {
-        language = "csharp"
-        transform = "reversed"
-        root = "com.jetbrains.rider.model.nova.ide.IdeRoot"
-        namespace = "JetBrains.Rider.Model"
-        directory = "$csOutput"
-    }
-}
-
-patchPluginXml {
-    // TODO: See also org.jetbrains.changelog: https://github.com/JetBrains/gradle-changelog-plugin
-    def changelogText = file("${rootDir}/CHANGELOG.md").text
-    def changelogMatches = changelogText =~ /(?s)(-.+?)(?=##|$)/
-
-    changeNotes = changelogMatches.collect {
-        it[1].replaceAll(/(?s)\r?\n/, "<br />\n")
-    }.take(1).join('')
-}
-
-prepareSandbox {
-    dependsOn compileDotNet
-
-    def outputFolder = "${rootDir}/src/dotnet/${DotnetPluginId}/bin/${DotnetPluginId}.Rider/${BuildConfiguration}"
-    def dllFiles = [
-            "$outputFolder/${DotnetPluginId}.dll",
-            "$outputFolder/${DotnetPluginId}.pdb",
-            // TODO: add additional assemblies
-    ]
-
-    dllFiles.forEach({ f ->
-        def file = file(f)
-        from(file, { into "${intellij.pluginName.get()}/dotnet" })
-    })
-
-    doLast {
-        dllFiles.forEach({ f ->
-            def file = file(f)
-            if (!file.exists()) throw new RuntimeException("File ${file} does not exist")
-        })
-    }
-}
-
-publishPlugin {
-    token.set(System.getenv("ORG_GRADLE_PROJECT_intellijPublishToken"))
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..17bf4d8
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,204 @@
+import com.jetbrains.plugin.structure.base.utils.isFile
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+import org.jetbrains.changelog.exceptions.MissingVersionException
+import org.jetbrains.intellij.platform.gradle.Constants
+import org.jetbrains.intellij.platform.gradle.TestFrameworkType
+import org.jetbrains.intellij.platform.gradle.tasks.PrepareSandboxTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import kotlin.io.path.absolute
+import kotlin.io.path.isDirectory
+
+plugins {
+    alias(libs.plugins.changelog)
+    alias(libs.plugins.gradleIntelliJPlatform)
+    alias(libs.plugins.gradleJvmWrapper)
+    alias(libs.plugins.kotlinJvm)
+    id("java")
+}
+
+allprojects {
+    repositories {
+        mavenCentral()
+    }
+}
+
+repositories {
+    intellijPlatform {
+        defaultRepositories()
+        jetbrainsRuntime()
+    }
+}
+
+val pluginVersion: String by project
+val riderSdkVersion: String by project
+val untilBuildVersion: String by project
+val buildConfiguration: String by project
+val dotNetPluginId: String by project
+
+val dotNetSrcDir = File(projectDir, "src/dotnet")
+
+version = pluginVersion
+
+val riderSdkPath by lazy {
+    val path = intellijPlatform.platformPath.resolve("lib/DotNetSdkForRdPlugins").absolute()
+    if (!path.isDirectory()) error("$path does not exist or not a directory")
+
+    println("Rider SDK path: $path")
+    return@lazy path
+}
+
+dependencies {
+    intellijPlatform {
+        rider(riderSdkVersion)
+        jetbrainsRuntime()
+        instrumentationTools()
+        testFramework(TestFrameworkType.Platform.Bundled)
+    }
+    testImplementation(libs.openTest4J)
+}
+
+kotlin {
+    jvmToolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+sourceSets {
+    main {
+        kotlin.srcDir("src/rider/generated/kotlin")
+        kotlin.srcDir("src/rider/main/kotlin")
+        resources.srcDir("src/rider/main/resources")
+    }
+}
+
+tasks {
+    val generateDotNetSdkProperties by registering {
+        val dotNetSdkGeneratedPropsFile = File(projectDir, "build/DotNetSdkPath.Generated.props")
+        doLast {
+            dotNetSdkGeneratedPropsFile.writeTextIfChanged("""<Project>
+  <PropertyGroup>
+    <DotNetSdkPath>$riderSdkPath</DotNetSdkPath>
+  </PropertyGroup>
+</Project>
+""")
+        }
+    }
+
+    val generateNuGetConfig by registering {
+        val nuGetConfigFile = File(dotNetSrcDir, "nuget.config")
+        doLast {
+            nuGetConfigFile.writeTextIfChanged("""
+            <?xml version="1.0" encoding="utf-8"?>
+            <!-- Auto-generated from 'generateNuGetConfig' task of old.build_gradle.kts -->
+            <!-- Run `gradlew :prepare` to regenerate -->
+            <configuration>
+                <packageSources>
+                    <add key="rider-sdk" value="$riderSdkPath" />
+                </packageSources>
+            </configuration>
+            """.trimIndent())
+        }
+    }
+
+    val rdGen = ":protocol:rdgen"
+
+    register("prepare") {
+        dependsOn(rdGen, generateDotNetSdkProperties, generateNuGetConfig)
+    }
+
+    val compileDotNet by registering {
+        dependsOn(rdGen, generateDotNetSdkProperties, generateNuGetConfig)
+        doLast {
+            exec {
+                executable("dotnet")
+                args("build", "-c", buildConfiguration)
+            }
+        }
+    }
+
+    withType<KotlinCompile> {
+        dependsOn(rdGen)
+    }
+
+    buildPlugin {
+        dependsOn(compileDotNet)
+    }
+
+    patchPluginXml {
+        untilBuild.set(untilBuildVersion)
+        val latestChangelog = try {
+            changelog.getUnreleased()
+        } catch (_: MissingVersionException) {
+            changelog.getLatest()
+        }
+        changeNotes.set(provider {
+            changelog.renderItem(
+                latestChangelog
+                    .withHeader(false)
+                    .withEmptySections(false),
+                org.jetbrains.changelog.Changelog.OutputType.HTML
+            )
+        })
+    }
+
+    withType<PrepareSandboxTask> {
+        dependsOn(compileDotNet)
+
+        val outputFolder = file("$dotNetSrcDir/$dotNetPluginId/bin/${dotNetPluginId}/$buildConfiguration")
+        val pluginFiles = listOf(
+            "$outputFolder/${dotNetPluginId}.dll",
+            "$outputFolder/${dotNetPluginId}.pdb"
+        )
+
+        from(pluginFiles) {
+            into("${rootProject.name}/dotnet")
+        }
+
+        doLast {
+            for (f in pluginFiles) {
+                val file = file(f)
+                if (!file.exists()) throw RuntimeException("File \"$file\" does not exist.")
+            }
+        }
+    }
+
+    runIde {
+        jvmArgs("-Xmx1500m")
+    }
+
+    test {
+        useTestNG()
+        testLogging {
+            showStandardStreams = true
+            exceptionFormat = TestExceptionFormat.FULL
+        }
+        environment["LOCAL_ENV_RUN"] = "true"
+    }
+}
+
+val riderModel: Configuration by configurations.creating {
+    isCanBeConsumed = true
+    isCanBeResolved = false
+}
+
+artifacts {
+    add(riderModel.name, provider {
+        intellijPlatform.platformPath.resolve("lib/rd/rider-model.jar").also {
+            check(it.isFile) {
+                "rider-model.jar is not found at $riderModel"
+            }
+        }
+    }) {
+        builtBy(Constants.Tasks.INITIALIZE_INTELLIJ_PLATFORM_PLUGIN)
+    }
+}
+
+fun File.writeTextIfChanged(content: String) {
+    val bytes = content.toByteArray()
+
+    if (!exists() || !readBytes().contentEquals(bytes)) {
+        println("Writing $path")
+        parentFile.mkdirs()
+        writeBytes(bytes)
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index e294fd0..b050060 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,20 +1,15 @@
-# Any property can be overwritten from command-line via
-#   -P<propertyName>=<value>
+pluginVersion=2024.2.0
 
-DotnetPluginId=ReSharperPlugin.NSubstituteComplete
-DotnetSolution=NSubstituteComplete.sln
-RiderPluginId=nsubstitutecomplete
-PluginVersion=2024.2.0
+# https://www.jetbrains.com/intellij-repository/snapshots
+riderSdkVersion=2024.2-EAP8-SNAPSHOT
+untilBuildVersion=243.*
 
-BuildConfiguration=Release
-PublishToken="_PLACE_HOLDER_"
+buildConfiguration=Debug
 
-# Possible values:
-#    2020.1.0-SNAPSHOT
-#    2020.1.0-EAP2-SNAPSHOT
-#    2020.1.0
-ProductVersion=2024.2-EAP8-SNAPSHOT
+riderPluginId=nsubstitutecomplete
+dotNetPluginId=ReSharperPlugin.NSubstituteComplete
 
-# 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
 kotlin.stdlib.default.dependency=false
+
+# Required to download Rider artifacts from Maven (and not "binary" releases from CDN).
+org.jetbrains.intellij.platform.buildFeature.useBinaryReleases=false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..9e8583b
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,15 @@
+[versions]
+# https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
+kotlin = "1.9.24"
+rdGen = "2024.1.1"
+
+[libraries]
+kotlinStdLib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
+openTest4J = "org.opentest4j:opentest4j:1.3.0"
+rdGen = { group = "com.jetbrains.rd", name = "rd-gen", version.ref = "rdGen" }
+
+[plugins]
+changelog = "org.jetbrains.changelog:2.2.1"
+gradleIntelliJPlatform = "org.jetbrains.intellij.platform:2.0.0-beta6"
+gradleJvmWrapper = "me.filippov.gradle.jvm.wrapper:0.14.0"
+kotlinJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2285123..dab2a01 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-8.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists
\ No newline at end of file
diff --git a/gradlew b/gradlew
index 1aa94a4..4987bc2 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -115,6 +115,97 @@ esac
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
+# GRADLE JVM WRAPPER START MARKER
+BUILD_DIR="${HOME}/.local/share/gradle-jvm"
+JVM_ARCH=$(uname -m)
+JVM_TEMP_FILE=$BUILD_DIR/gradle-jvm-temp.tar.gz
+if [ "$darwin" = "true" ]; then
+    case $JVM_ARCH in
+    x86_64)
+        JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_macos-x64_bin.tar.gz
+        JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_macos-x64_bin-1bcf03
+        ;;
+    arm64)
+        JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_macos-aarch64_bin.tar.gz
+        JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_macos-aarch64_bin-297fa2
+        ;;
+    *)
+        die "Unknown architecture $JVM_ARCH"
+        ;;
+    esac
+elif [ "$cygwin" = "true" ] || [ "$msys" = "true" ]; then
+    JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_windows-x64_bin.zip
+    JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_windows-x64_bin-d6ede5
+else
+    JVM_ARCH=$(linux$(getconf LONG_BIT) uname -m)
+     case $JVM_ARCH in
+        x86_64)
+            JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_linux-x64_bin.tar.gz
+            JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_linux-x64_bin-9324ae
+            ;;
+        aarch64)
+            JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_linux-aarch64_bin.tar.gz
+            JVM_TARGET_DIR=$BUILD_DIR/jdk-17.0.3.1_linux-aarch64_bin-319da6
+            ;;
+        *)
+            die "Unknown architecture $JVM_ARCH"
+            ;;
+        esac
+fi
+
+set -e
+
+if [ -e "$JVM_TARGET_DIR/.flag" ] && [ -n "$(ls "$JVM_TARGET_DIR")" ] && [ "x$(cat "$JVM_TARGET_DIR/.flag")" = "x${JVM_URL}" ]; then
+    # Everything is up-to-date in $JVM_TARGET_DIR, do nothing
+    true
+else
+  echo "Downloading $JVM_URL to $JVM_TEMP_FILE"
+
+  rm -f "$JVM_TEMP_FILE"
+  mkdir -p "$BUILD_DIR"
+  if command -v curl >/dev/null 2>&1; then
+      if [ -t 1 ]; then CURL_PROGRESS="--progress-bar"; else CURL_PROGRESS="--silent --show-error"; fi
+      # shellcheck disable=SC2086
+      curl $CURL_PROGRESS -L --output "${JVM_TEMP_FILE}" "$JVM_URL" 2>&1
+  elif command -v wget >/dev/null 2>&1; then
+      if [ -t 1 ]; then WGET_PROGRESS=""; else WGET_PROGRESS="-nv"; fi
+      wget $WGET_PROGRESS -O "${JVM_TEMP_FILE}" "$JVM_URL" 2>&1
+  else
+      die "ERROR: Please install wget or curl"
+  fi
+
+  echo "Extracting $JVM_TEMP_FILE to $JVM_TARGET_DIR"
+  rm -rf "$JVM_TARGET_DIR"
+  mkdir -p "$JVM_TARGET_DIR"
+
+  case "$JVM_URL" in
+    *".zip") unzip "$JVM_TEMP_FILE" -d "$JVM_TARGET_DIR" ;;
+    *) tar -x -f "$JVM_TEMP_FILE" -C "$JVM_TARGET_DIR" ;;
+  esac
+
+  rm -f "$JVM_TEMP_FILE"
+
+  echo "$JVM_URL" >"$JVM_TARGET_DIR/.flag"
+fi
+
+JAVA_HOME=
+for d in "$JVM_TARGET_DIR" "$JVM_TARGET_DIR"/* "$JVM_TARGET_DIR"/Contents/Home "$JVM_TARGET_DIR"/*/Contents/Home; do
+  if [ -e "$d/bin/java" ]; then
+    JAVA_HOME="$d"
+  fi
+done
+
+if [ '!' -e "$JAVA_HOME/bin/java" ]; then
+  die "Unable to find bin/java under $JVM_TARGET_DIR"
+fi
+
+# Make it available for child processes
+export JAVA_HOME
+
+set +e
+
+# GRADLE JVM WRAPPER END MARKER
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -246,4 +337,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"
\ No newline at end of file
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59..4ccb983 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -36,6 +36,82 @@ for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
+@rem GRADLE JVM WRAPPER START MARKER
+
+setlocal
+set BUILD_DIR=%LOCALAPPDATA%\gradle-jvm
+set JVM_TARGET_DIR=%BUILD_DIR%\jdk-17.0.3.1_windows-x64_bin-d6ede5\
+
+set JVM_URL=https://download.oracle.com/java/17/archive/jdk-17.0.3.1_windows-x64_bin.zip
+
+set IS_TAR_GZ=0
+set JVM_TEMP_FILE=gradle-jvm.zip
+
+if /I "%JVM_URL:~-7%"==".tar.gz" (
+    set IS_TAR_GZ=1
+    set JVM_TEMP_FILE=gradle-jvm.tar.gz
+)
+
+set POWERSHELL=%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe
+
+if not exist "%JVM_TARGET_DIR%" MD "%JVM_TARGET_DIR%"
+
+if not exist "%JVM_TARGET_DIR%.flag" goto downloadAndExtractJvm
+
+set /p CURRENT_FLAG=<"%JVM_TARGET_DIR%.flag"
+if "%CURRENT_FLAG%" == "%JVM_URL%" goto continueWithJvm
+
+:downloadAndExtractJvm
+
+PUSHD "%BUILD_DIR%"
+if errorlevel 1 goto fail
+
+echo Downloading %JVM_URL% to %BUILD_DIR%\%JVM_TEMP_FILE%
+if exist "%JVM_TEMP_FILE%" DEL /F "%JVM_TEMP_FILE%"
+"%POWERSHELL%" -nologo -noprofile -Command "Set-StrictMode -Version 3.0; $ErrorActionPreference = \"Stop\"; (New-Object Net.WebClient).DownloadFile('%JVM_URL%', '%JVM_TEMP_FILE%')"
+if errorlevel 1 goto fail
+
+POPD
+
+RMDIR /S /Q "%JVM_TARGET_DIR%"
+if errorlevel 1 goto fail
+
+MKDIR "%JVM_TARGET_DIR%"
+if errorlevel 1 goto fail
+
+PUSHD "%JVM_TARGET_DIR%"
+if errorlevel 1 goto fail
+
+echo Extracting %BUILD_DIR%\%JVM_TEMP_FILE% to %JVM_TARGET_DIR%
+
+if "%IS_TAR_GZ%"=="1" (
+    tar xf "..\\%JVM_TEMP_FILE%"
+) else (
+    "%POWERSHELL%" -nologo -noprofile -command "Set-StrictMode -Version 3.0; $ErrorActionPreference = \"Stop\"; Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('..\\%JVM_TEMP_FILE%', '.');"
+)
+if errorlevel 1 goto fail
+
+DEL /F "..\%JVM_TEMP_FILE%"
+if errorlevel 1 goto fail
+
+POPD
+
+echo %JVM_URL%>"%JVM_TARGET_DIR%.flag"
+if errorlevel 1 goto fail
+
+:continueWithJvm
+
+set JAVA_HOME=
+for /d %%d in ("%JVM_TARGET_DIR%"*) do if exist "%%d\bin\java.exe" set JAVA_HOME=%%d
+if not exist "%JAVA_HOME%\bin\java.exe" (
+  echo Unable to find java.exe under %JVM_TARGET_DIR%
+  goto fail
+)
+
+endlocal & set JAVA_HOME=%JAVA_HOME%
+
+@rem GRADLE JVM WRAPPER END MARKER
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -43,11 +119,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +133,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -89,4 +165,4 @@ exit /b %EXIT_CODE%
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega
\ No newline at end of file
diff --git a/protocol/build.gradle b/protocol/build.gradle
deleted file mode 100644
index b77a89c..0000000
--- a/protocol/build.gradle
+++ /dev/null
@@ -1,17 +0,0 @@
-plugins {
-    id 'java'
-    id 'org.jetbrains.kotlin.jvm'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib"
-    implementation name: "rd-gen"
-    implementation name: "rider-model"
-}
-
-repositories {
-    mavenCentral()
-    flatDir {
-        dirs rdLibDirectory().absolutePath
-    }
-}
diff --git a/protocol/build.gradle.kts b/protocol/build.gradle.kts
new file mode 100644
index 0000000..ec60600
--- /dev/null
+++ b/protocol/build.gradle.kts
@@ -0,0 +1,54 @@
+import com.jetbrains.rd.generator.gradle.RdGenTask
+
+plugins {
+    alias(libs.plugins.kotlinJvm)
+    id("com.jetbrains.rdgen") version libs.versions.rdGen
+}
+
+dependencies {
+    implementation(libs.rdGen)
+    implementation(libs.kotlinStdLib)
+    implementation(
+        project(
+            mapOf(
+                "path" to ":",
+                "configuration" to "riderModel"
+            )
+        )
+    )
+}
+
+val dotNetPluginId: String by project
+val riderPluginId: String by project
+
+rdgen {
+    val csOutput = file("../src/dotnet/${dotNetPluginId}/Model").absolutePath
+    val ktOutput = file("../src/rider/generated/kotlin/${riderPluginId.replace('.','/').lowercase()}").absolutePath
+
+    verbose = true
+    packages = "model"
+
+    generator {
+        language = "kotlin"
+        transform = "asis"
+        root = "com.jetbrains.rider.model.nova.ide.IdeRoot"
+        namespace = "$riderPluginId.model"
+        directory = ktOutput.toString()
+        generatedFileSuffix = ".Generated"
+    }
+
+    generator {
+        language = "csharp"
+        transform = "reversed"
+        root = "com.jetbrains.rider.model.nova.ide.IdeRoot"
+        namespace = "$dotNetPluginId.Model"
+        directory = csOutput.toString()
+        generatedFileSuffix = ".Generated"
+    }
+}
+
+tasks.withType<RdGenTask> {
+    val classPath = sourceSets["main"].runtimeClasspath
+    dependsOn(classPath)
+    classpath(classPath)
+}
diff --git a/protocol/src/main/kotlin/model/rider/RdSampleModel.kt b/protocol/src/main/kotlin/model/rider/RdSampleModel.kt
new file mode 100644
index 0000000..7961f57
--- /dev/null
+++ b/protocol/src/main/kotlin/model/rider/RdSampleModel.kt
@@ -0,0 +1,27 @@
+package model.rider
+
+import com.jetbrains.rd.generator.nova.*
+import com.jetbrains.rd.generator.nova.PredefinedType.string
+import com.jetbrains.rd.generator.nova.PredefinedType.int
+import com.jetbrains.rd.generator.nova.csharp.CSharp50Generator
+import com.jetbrains.rd.generator.nova.kotlin.Kotlin11Generator
+import com.jetbrains.rider.model.nova.ide.SolutionModel
+
+@Suppress("unused")
+object RdSampleModel : Ext(SolutionModel.Solution) {
+    private val RdCallRequest = structdef {
+        field("myField", string)
+    }
+
+    private val RdCallResponse = structdef {
+        field("myResult", int)
+    }
+
+    init {
+        setting(Kotlin11Generator.Namespace, "com.jetbrains.rider.plugins.plugintemplate.model")
+        setting(CSharp50Generator.Namespace, "Rider.Plugins.PluginTemplate.Model")
+
+        call("myCall", RdCallRequest, RdCallResponse)
+            .doc("This is an example protocol call.")
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 493d09b..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1,22 +0,0 @@
-pluginManagement {
-    // Provide repositories to resolve plugins
-    repositories {
-        maven { url "https://cache-redirector.jetbrains.com/plugins.gradle.org" }
-        maven { url "https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap" }
-        maven { url "https://cache-redirector.jetbrains.com/myget.org.rd-snapshots.maven" }
-    }
-    resolutionStrategy {
-        eachPlugin {
-            // Gradle has to map a plugin dependency to Maven coordinates - '{groupId}:{artifactId}:{version}'. It tries
-            // to do use '{plugin.id}:{plugin.id}.gradle.plugin:version'.
-            // This doesn't work for rdgen, so we provide some help
-            if (requested.id.id == "com.jetbrains.rdgen") {
-                useModule("com.jetbrains.rd:rd-gen:${requested.version}")
-            }
-        }
-    }
-}
-
-rootProject.name = 'nsubstitutecomplete'
-
-include ':protocol'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..2db2a6b
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,16 @@
+rootProject.name = "nsubstitutecomplete"
+include(":protocol")
+
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        mavenCentral()
+    }
+    resolutionStrategy {
+        eachPlugin {
+            if (requested.id.id == "com.jetbrains.rdgen") {
+                useModule("com.jetbrains.rd:rd-gen:${requested.version}")
+            }
+        }
+    }
+}