Merge pull request #1019 from JetBrains/rival/target-eap-5

rafaelldi · web-flow · commit 60fbec42ef09 · 2025-02-24T11:10:06.000+01:00
Target eap 5
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-arm/build.gradle.kts
@@ -21,6 +21,7 @@ dependencies {
     intellijPlatform {
         rider(platformVersion, false)
         jetbrainsRuntime()
+        bundledModules("intellij.json.split")
         bundledPlugins("com.intellij.modules.json")
     }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cloud-shell/src/main/kotlin/com/microsoft/azure/toolkit/intellij/cloudshell/controlchannel/DownloadControlMessageHandler.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cloud-shell/src/main/kotlin/com/microsoft/azure/toolkit/intellij/cloudshell/controlchannel/DownloadControlMessageHandler.kt
@@ -17,11 +17,11 @@ import com.intellij.openapi.vfs.LocalFileSystem
 import com.intellij.platform.ide.progress.withBackgroundProgress
 import com.microsoft.azure.toolkit.intellij.cloudshell.actions.RevealFileAction
 import com.microsoft.azure.toolkit.intellij.cloudshell.rest.CloudConsoleService
-import io.ktor.util.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlin.io.path.extension
 import kotlin.io.path.moveTo
 
 @Service(Service.Level.PROJECT)
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/build.gradle.kts b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-monitor/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     intellijPlatform {
         rider(platformVersion, false)
         jetbrainsRuntime()
-        bundledModule("intellij.libraries.microba")
+        bundledModules("intellij.libraries.microba", "intellij.json.split")
         bundledPlugins(listOf("com.intellij.properties", "com.intellij.modules.json"))
     }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/runtarget/AzureVmTargetType.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-vm/src/main/java/com/microsoft/azure/toolkit/intellij/vm/runtarget/AzureVmTargetType.java
@@ -35,6 +35,8 @@
 import java.util.List;
 import java.util.function.Supplier;
 
+import static com.jetbrains.plugins.remotesdk.target.ssh.target.SshTargetTypeKt.handleSshTargetTypeBrowsing;
+
 @Getter
 public class AzureVmTargetType extends TargetEnvironmentType<AzureVmTargetEnvironmentConfiguration> implements BrowsableTargetEnvironmentType {
     public static final String TYPE_ID = "Microsoft.Compute/virtualMachines";
@@ -117,7 +119,7 @@ public final void actionPerformed(ActionEvent it) {
                 if (configuration instanceof SshTargetEnvironmentConfiguration) {
                     final SshConfig sshConfig = ((SshTargetEnvironmentConfiguration) configuration).findSshConfig(project);
                     final SshUiData uiData = sshConfig != null ? new SshUiData(sshConfig, true) : null;
-                    SshTargetType.Companion.handleBrowsing$intellij_remoteRun(uiData, project, title, component, textComponentAccessor);
+                    handleSshTargetTypeBrowsing(uiData, project, title, component, textComponentAccessor);
                 } else {
                     Messages.showWarningDialog(component, RemoteSdkBundle.message("dialog.message.got.unexpected.settings.for.browsing", new Object[0]), title);
                 }
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionProjectSessionDebugProfile.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionProjectSessionDebugProfile.kt
@@ -19,13 +19,13 @@ import javax.swing.Icon
 
 class FunctionProjectSessionDebugProfile(
     private val sessionId: String,
-    projectName: String,
+    projectPath: Path,
     dotnetExecutable: DotNetExecutable,
     private val dotnetRuntime: DotNetCoreRuntime,
     private val sessionProcessEventListener: ProcessListener,
     private val sessionProcessLifetime: Lifetime,
     aspireHostProjectPath: Path?
-) : ProjectSessionProfile(projectName, dotnetExecutable, aspireHostProjectPath), IRiderDebuggable {
+) : ProjectSessionProfile(projectPath, dotnetExecutable, aspireHostProjectPath, true), IRiderDebuggable {
 
     override fun getIcon(): Icon = IntelliJAzureIcons.getIcon(AzureIcons.FunctionApp.RUN)
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionProjectSessionProcessLauncher.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionProjectSessionProcessLauncher.kt
@@ -2,6 +2,8 @@
  * Copyright 2018-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the MIT license.
  */
 
+@file:Suppress("UnstableApiUsage")
+
 package com.microsoft.azure.toolkit.intellij.aspire
 
 import com.intellij.execution.executors.DefaultDebugExecutor
@@ -19,6 +21,8 @@ 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.projectLaunchers.SessionProcessLauncherExtension
+import com.jetbrains.rider.aspire.sessionHost.projectLaunchers.getAspireHostRunConfiguration
+import com.jetbrains.rider.aspire.sessionHost.projectLaunchers.getDotNetRuntime
 import com.jetbrains.rider.model.runnableProjectsModel
 import com.jetbrains.rider.projectView.solution
 import com.jetbrains.rider.runtime.DotNetExecutable
@@ -27,7 +31,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.nio.file.Path
 import kotlin.io.path.Path
-import kotlin.io.path.nameWithoutExtension
 
 class FunctionProjectSessionProcessLauncher : SessionProcessLauncherExtension {
     companion object {
@@ -64,12 +67,12 @@ class FunctionProjectSessionProcessLauncher : SessionProcessLauncherExtension {
         ) ?: return
         val runtime = getDotNetRuntime(executable, project) ?: return
 
-        val projectName = Path(sessionModel.projectPath).nameWithoutExtension
+        val projectPath = Path(sessionModel.projectPath)
         val aspireHostProjectPath = aspireHostRunConfig?.let { Path(it.parameters.projectFilePath) }
 
         val profile = getRunProfile(
             sessionId,
-            projectName,
+            projectPath,
             executable,
             runtime,
             sessionProcessEventListener,
@@ -111,12 +114,12 @@ class FunctionProjectSessionProcessLauncher : SessionProcessLauncherExtension {
         ) ?: return
         val runtime = getDotNetRuntime(executable, project) ?: return
 
-        val projectName = Path(sessionModel.projectPath).nameWithoutExtension
+        val projectPath = Path(sessionModel.projectPath)
         val aspireHostProjectPath = aspireHostRunConfig?.let { Path(it.parameters.projectFilePath) }
 
         val profile = getDebugProfile(
             sessionId,
-            projectName,
+            projectPath,
             executable,
             runtime,
             sessionProcessEventListener,
@@ -162,15 +165,15 @@ class FunctionProjectSessionProcessLauncher : SessionProcessLauncherExtension {
 
     private fun getRunProfile(
         sessionId: String,
-        projectName: String,
+        projectPath: Path,
         dotnetExecutable: DotNetExecutable,
         dotnetRuntime: DotNetCoreRuntime,
         sessionProcessEventListener: ProcessListener,
         sessionProcessLifetime: Lifetime,
         aspireHostProjectPath: Path?
     ) = FunctionProjectSessionRunProfile(
         sessionId,
-        projectName,
+        projectPath,
         dotnetExecutable,
         dotnetRuntime,
         sessionProcessEventListener,
@@ -180,15 +183,15 @@ class FunctionProjectSessionProcessLauncher : SessionProcessLauncherExtension {
 
     private fun getDebugProfile(
         sessionId: String,
-        projectName: String,
+        projectPath: Path,
         dotnetExecutable: DotNetExecutable,
         dotnetRuntime: DotNetCoreRuntime,
         sessionProcessEventListener: ProcessListener,
         sessionProcessLifetime: Lifetime,
         aspireHostProjectPath: Path?
     ) = FunctionProjectSessionDebugProfile(
         sessionId,
-        projectName,
+        projectPath,
         dotnetExecutable,
         dotnetRuntime,
         sessionProcessEventListener,
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionProjectSessionRunProfile.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionProjectSessionRunProfile.kt
@@ -19,13 +19,13 @@ import javax.swing.Icon
 
 class FunctionProjectSessionRunProfile(
     private val sessionId: String,
-    projectName: String,
+    projectPath: Path,
     dotnetExecutable: DotNetExecutable,
     private val dotnetRuntime: DotNetCoreRuntime,
     private val sessionProcessEventListener: ProcessListener,
     private val sessionProcessLifetime: Lifetime,
     aspireHostProjectPath: Path?
-) : ProjectSessionProfile(projectName, dotnetExecutable, aspireHostProjectPath) {
+) : ProjectSessionProfile(projectPath, dotnetExecutable, aspireHostProjectPath, false) {
 
     override fun getIcon(): Icon = IntelliJAzureIcons.getIcon(AzureIcons.FunctionApp.RUN)
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionSessionExecutableFactory.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/FunctionSessionExecutableFactory.kt
@@ -16,6 +16,9 @@ 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.getLaunchProfile
+import com.jetbrains.rider.aspire.sessionHost.mergeArguments
+import com.jetbrains.rider.aspire.sessionHost.mergeEnvironmentVariables
 import com.jetbrains.rider.aspire.settings.AspireSettings
 import com.jetbrains.rider.aspire.util.MSBuildPropertyService
 import com.jetbrains.rider.aspire.util.MSBuildPropertyService.ProjectRunProperties
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/TempFunctionProjectSessionProcessLauncherUtils.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/TempFunctionProjectSessionProcessLauncherUtils.kt
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/TempSessionExecutableFactoryUtils.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet-aspire/src/main/kotlin/com/microsoft/azure/toolkit/intellij/aspire/TempSessionExecutableFactoryUtils.kt
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/debugger/relay/RelayServer.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/debugger/relay/RelayServer.kt
@@ -2,6 +2,7 @@ package com.microsoft.azure.toolkit.intellij.debugger.relay
 
 import com.azure.core.credential.TokenRequestContext
 import com.azure.identity.implementation.util.ScopeUtil
+import com.intellij.openapi.progress.runBlockingCancellable
 import com.intellij.platform.util.coroutines.childScope
 import com.intellij.remote.RemoteCredentials
 import com.intellij.remote.RemoteCredentialsHolder
@@ -64,7 +65,9 @@ abstract class RelayServer(protected val appServiceApp: AppServiceAppBase<*, *,
 
     protected inner class SocketServer(hostName: String, port: Int = 0) {
         private val selectorManager = ActorSelectorManager(Dispatchers.IO)
-        private val serverSocket = aSocket(selectorManager).tcp().bind(InetSocketAddress(hostName, port))
+        private val serverSocket: ServerSocket = runBlocking {
+             aSocket(selectorManager).tcp().bind(InetSocketAddress(hostName, port))
+        }
 
         val port = (serverSocket.localAddress as InetSocketAddress).port
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/debugger/relay/WebSocketRelay.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/debugger/relay/WebSocketRelay.kt
@@ -12,12 +12,13 @@ import kotlinx.coroutines.channels.ReceiveChannel
 import kotlinx.coroutines.channels.SendChannel
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import kotlin.time.Duration.Companion.seconds
 
 class WebSocketRelay(private val requestProvider: HttpRequestBuilder.() -> Unit) : Relay {
     private val logger = logger<WebSocketRelay>()
     private val client = HttpClient(CIO) {
         install(WebSockets) {
-            pingInterval = 30000
+            pingInterval = 30.seconds
         }
     }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/legacy/function/toolingFeed/FunctionsToolingFeedService.kt b/PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/legacy/function/toolingFeed/FunctionsToolingFeedService.kt
@@ -28,6 +28,7 @@ import io.ktor.serialization.kotlinx.json.*
 import io.ktor.utils.io.ByteReadChannel
 import io.ktor.utils.io.core.isEmpty
 import io.ktor.utils.io.core.readBytes
+import io.ktor.utils.io.readRemaining
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties b/PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties
@@ -15,7 +15,7 @@ pluginUntilBuild = 251.*
 #   Release:  2020.2
 #   EAP:      2020.3-EAP2-SNAPSHOT
 #   Nightly:  2020.3-SNAPSHOT
-platformVersion = 2025.1-EAP3-SNAPSHOT
+platformVersion = 2025.1-SNAPSHOT
 
 dotnetBuildConfiguration=Release
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ dependencies {`
`21`	`21`	`intellijPlatform {`
`22`	`22`	`rider(platformVersion, false)`
`23`	`23`	`jetbrainsRuntime()`
	`24`	`+ bundledModules("intellij.json.split")`
`24`	`25`	`bundledPlugins("com.intellij.modules.json")`
`25`	`26`	`}`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ dependencies {`
`20`	`20`	`intellijPlatform {`
`21`	`21`	`rider(platformVersion, false)`
`22`	`22`	`jetbrainsRuntime()`
`23`		`- bundledModule("intellij.libraries.microba")`
	`23`	`+ bundledModules("intellij.libraries.microba", "intellij.json.split")`
`24`	`24`	`bundledPlugins(listOf("com.intellij.properties", "com.intellij.modules.json"))`
`25`	`25`	`}`
`26`	`26`