Merge pull request #1107 from JetBrains/rival/fix-aspire-integration

Fix .NET Aspire integration

Author: rafaelldi

PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md

@@ -6,6 +6,12 @@
 
 ### Fixed
 
+- Fix .NET Aspire integration
+
+## [4.5.2] - 2025-08-14
+
+### Fixed
+
 - Unable to start SSH session to Azure Virtual Machine ([RIDER-127487](https://youtrack.jetbrains.com/issue/RIDER-127487))
 
 ## [4.5.2] - 2025-07-10
@@ -346,7 +352,8 @@
 - Reimplement Azure Functions Core Tools integration
 - Reimplement Azure Functions templates
 
-[Unreleased]: https://github.com/JetBrains/azure-tools-for-intellij/compare/v4.5.2...HEAD
+[Unreleased]: https://github.com/JetBrains/azure-tools-for-intellij/compare/v4.5.3...HEAD
+[4.5.3]: https://github.com/JetBrains/azure-tools-for-intellij/compare/v4.5.2...v4.5.3
 [4.5.2]: https://github.com/JetBrains/azure-tools-for-intellij/compare/v4.5.1...v4.5.2
 [4.5.1]: https://github.com/JetBrains/azure-tools-for-intellij/compare/v4.5.0...v4.5.1
 [4.5.0]: https://github.com/JetBrains/azure-tools-for-intellij/compare/v4.4.8...v4.5.0

PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionProjectSessionDebugProfile.kt

@@ -8,7 +8,7 @@ import com.intellij.execution.Executor
 import com.intellij.execution.process.ProcessListener
 import com.intellij.execution.runners.ExecutionEnvironment
 import com.jetbrains.rd.util.lifetime.Lifetime
-import com.jetbrains.rider.aspire.sessionHost.projectLaunchers.ProjectSessionProfile
+import com.jetbrains.rider.aspire.sessions.projectLaunchers.ProjectSessionProfile
 import com.jetbrains.rider.runtime.DotNetExecutable
 import com.jetbrains.rider.runtime.dotNetCore.DotNetCoreRuntime
 import com.microsoft.azure.toolkit.ide.common.icon.AzureIcons

PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionProjectSessionProcessLauncher.kt

@@ -13,8 +13,8 @@ import com.intellij.openapi.project.Project
 import com.jetbrains.rd.util.lifetime.Lifetime
 import com.jetbrains.rider.aspire.generated.CreateSessionRequest
 import com.jetbrains.rider.aspire.run.AspireHostConfiguration
-import com.jetbrains.rider.aspire.sessionHost.findBySessionProject
-import com.jetbrains.rider.aspire.sessionHost.projectLaunchers.DotNetExecutableSessionProcessLauncher
+import com.jetbrains.rider.aspire.sessions.findBySessionProject
+import com.jetbrains.rider.aspire.sessions.projectLaunchers.DotNetExecutableSessionProcessLauncher
 import com.jetbrains.rider.model.runnableProjectsModel
 import com.jetbrains.rider.projectView.solution
 import com.jetbrains.rider.runtime.DotNetExecutable

PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionProjectSessionRunProfile.kt

@@ -8,8 +8,8 @@ import com.intellij.execution.Executor
 import com.intellij.execution.process.ProcessListener
 import com.intellij.execution.runners.ExecutionEnvironment
 import com.jetbrains.rd.util.lifetime.Lifetime
-import com.jetbrains.rider.aspire.sessionHost.projectLaunchers.ProjectSessionProfile
-import com.jetbrains.rider.aspire.sessionHost.projectLaunchers.DotNetExecutableSessionRunProfileState
+import com.jetbrains.rider.aspire.sessions.projectLaunchers.DotNetExecutableSessionRunProfileState
+import com.jetbrains.rider.aspire.sessions.projectLaunchers.ProjectSessionProfile
 import com.jetbrains.rider.runtime.DotNetExecutable
 import com.jetbrains.rider.runtime.dotNetCore.DotNetCoreRuntime
 import com.microsoft.azure.toolkit.ide.common.icon.AzureIcons

PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionSessionExecutableFactory.kt

@@ -16,10 +16,10 @@ import com.intellij.openapi.project.Project
 import com.intellij.util.io.systemIndependentPath
 import com.jetbrains.rider.aspire.generated.CreateSessionRequest
 import com.jetbrains.rider.aspire.run.AspireHostConfiguration
-import com.jetbrains.rider.aspire.sessionHost.findBySessionProject
-import com.jetbrains.rider.aspire.sessionHost.getLaunchProfile
-import com.jetbrains.rider.aspire.sessionHost.mergeArguments
-import com.jetbrains.rider.aspire.sessionHost.mergeEnvironmentVariables
+import com.jetbrains.rider.aspire.sessions.findBySessionProject
+import com.jetbrains.rider.aspire.sessions.getLaunchProfile
+import com.jetbrains.rider.aspire.sessions.mergeArguments
+import com.jetbrains.rider.aspire.sessions.mergeEnvironmentVariables
 import com.jetbrains.rider.aspire.settings.AspireSettings
 import com.jetbrains.rider.aspire.util.MSBuildPropertyService
 import com.jetbrains.rider.aspire.util.MSBuildPropertyService.ProjectRunProperties

PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties

@@ -4,7 +4,7 @@ pluginGroup = com.jetbrains
 pluginName = Azure Toolkit for Rider
 pluginRepositoryUrl = https://github.com/JetBrains/azure-tools-for-intellij
 # SemVer format -> https://semver.org
-pluginVersion = 4.5.3
+pluginVersion = 4.5.4
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 252
@@ -14,11 +14,11 @@ pluginSinceBuild = 252
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-platformVersion = 2025.2
+platformVersion = 2025.2-SNAPSHOT
 
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions.
-pluginVerificationIdeVersion = 2025.2
+pluginVerificationIdeVersion = 2025.2-SNAPSHOT
 
 dotnetBuildConfiguration=Release