Merge pull request #269 from JetBrains/next

Updates
JetBrains · Oct 21, 2024 · 9ca6966 · 9ca6966
2 parents 33c366e + 2de856b
commit 9ca6966
Show file tree

Hide file tree

Showing 13 changed files with 219 additions and 59 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
 
       # Free GitHub Actions Environment Disk Space
       - name: Maximize Build Space
-        uses: jlumbroso/free-disk-space@main
+        uses: jlumbroso/free-disk-space@v1.3.1
         with:
           tool-cache: false
           large-packages: false
@@ -119,7 +119,7 @@ jobs:
 
       # Free GitHub Actions Environment Disk Space
       - name: Maximize Build Space
-        uses: jlumbroso/free-disk-space@main
+        uses: jlumbroso/free-disk-space@v1.3.1
         with:
           tool-cache: false
           large-packages: false
@@ -170,7 +170,7 @@ jobs:
 
       # Free GitHub Actions Environment Disk Space
       - name: Maximize Build Space
-        uses: jlumbroso/free-disk-space@main
+        uses: jlumbroso/free-disk-space@v1.3.1
         with:
           tool-cache: false
           large-packages: false
@@ -212,7 +212,7 @@ jobs:
 
       # Free GitHub Actions Environment Disk Space
       - name: Maximize Build Space
-        uses: jlumbroso/free-disk-space@main
+        uses: jlumbroso/free-disk-space@v1.3.1
         with:
           tool-cache: false
           large-packages: false

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,7 +20,7 @@ jobs:
 
       # Free GitHub Actions Environment Disk Space
       - name: Maximize Build Space
-        uses: jlumbroso/free-disk-space@main
+        uses: jlumbroso/free-disk-space@v1.3.1
         with:
           tool-cache: false
           large-packages: false

diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
@@ -45,8 +45,6 @@ jobs:
       # Setup Gradle
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
-        with:
-          gradle-home-cache-cleanup: true
 
       # Setup .NET 8 environment for the next steps
       - name: Setup .NET

diff --git a/.run/Run Plugin.run.xml b/.run/Run Plugin.run.xml
@@ -19,6 +19,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
 </component>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -44,6 +44,8 @@ dependencies {
 
         jetbrainsRuntime()
 
+        bundledModule("intellij.rider")
+
         // Plugin Dependencies. Uses `platformBundledPlugins` property from the gradle.properties file for bundled IntelliJ Platform plugins.
         bundledPlugins(providers.gradleProperty("platformBundledPlugins").map { it.split(',') })
 

diff --git a/gradle.properties b/gradle.properties
@@ -4,18 +4,18 @@ pluginGroup = me.rafaelldi.aspire
 pluginName = aspire-plugin
 pluginRepositoryUrl = https://github.com/JetBrains/aspire-plugin
 # SemVer format -> https://semver.org
-pluginVersion = 1.5.1
+pluginVersion = 1.6.0
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild = 242
-pluginUntilBuild = 242.*
+pluginSinceBuild = 243
+pluginUntilBuild = 243.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 # Examples:
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-platformVersion = 2024.2.5
+platformVersion = 2024.3-EAP4-SNAPSHOT
 
 dotnetBuildConfiguration = Release
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,14 +1,14 @@
 [versions]
 # libraries
 # https://search.maven.org/artifact/com.jetbrains.rd/rd-gen
-rdGen = "2024.1.1"
+rdGen = "2024.3.0"
 opentest4j = "1.3.0"
-serialization = "1.7.2"
+serialization = "1.7.3"
 
 # plugins
-kotlin = "2.0.20"
+kotlin = "2.0.21"
 changelog = "2.2.1"
-intelliJPlatform = "2.0.1"
+intelliJPlatform = "2.1.0"
 qodana = "2024.2.3"
 
 [libraries]

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -12,6 +12,10 @@ pluginManagement {
     }
 }
 
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "aspire-plugin"
 
 include(":protocol")
diff --git a/src/dotnet/aspire-plugin/RunnableProject/AspireRunnableProjectProvider.cs b/src/dotnet/aspire-plugin/RunnableProject/AspireRunnableProjectProvider.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using JetBrains.Application.Parts;
 using JetBrains.ProjectModel;
 using JetBrains.ProjectModel.Properties;
 using JetBrains.ReSharper.Features.Running;
@@ -8,7 +9,7 @@
 
 namespace JetBrains.Rider.Aspire.RunnableProject;
 
-[SolutionComponent]
+[SolutionComponent(Instantiation.DemandAnyThreadUnsafe)]
 public class AspireRunnableProjectProvider(
     ProjectRunnableOutputDetector projectRunnableOutputDetector,
     ILogger logger