Updates

JetBrains · Oct 1, 2024 · a8f9d45 · a8f9d45
1 parent 904b0eb
commit a8f9d45
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -105,7 +105,9 @@ intellijPlatform {
         // The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
         // Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
         // https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
-        channels = providers.gradleProperty("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
+        channels = providers.gradleProperty("pluginVersion")
+            .map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
+        hidden = true
     }
 
     pluginVerification {

diff --git a/qodana.yml b/qodana.yml
@@ -2,7 +2,7 @@
 # https://www.jetbrains.com/help/qodana/qodana-yaml.html
 
 version: 1.0
-linter: jetbrains/qodana-jvm-community:2024.2
+linter: jetbrains/qodana-jvm:2024.2
 projectJDK: "17"
 profile:
   name: qodana.recommended

diff --git a/src/main/kotlin/com/jetbrains/rider/aspire/run/AspireHostConfigurationParameters.kt b/src/main/kotlin/com/jetbrains/rider/aspire/run/AspireHostConfigurationParameters.kt
@@ -49,8 +49,8 @@ class AspireHostConfigurationParameters(
             "",
             true,
             hashMapOf(),
-            false,
-            true,
+            usePodmanRuntime = false,
+            trackUrl = true,
             DotNetStartBrowserParameters()
         )
     }

diff --git a/src/main/kotlin/com/jetbrains/rider/aspire/run/AspireHostExecutorFactory.kt b/src/main/kotlin/com/jetbrains/rider/aspire/run/AspireHostExecutorFactory.kt
@@ -113,8 +113,8 @@ class AspireHostExecutorFactory(
             params.tfm ?: projectOutput.tfm,
             params.workingDirectoryPath ?: projectOutput.workingDirectory,
             params.commandLineArgumentString ?: ParametersListUtil.join(projectOutput.defaultArguments),
-            false,
-            false,
+            useMonoRuntime = false,
+            useExternalConsole = false,
             params.environmentVariables,
             true,
             getStartBrowserAction(effectiveUrl, parameters.startBrowserParameters),

diff --git a/src/main/kotlin/com/jetbrains/rider/aspire/sessionHost/SessionExecutableFactory.kt b/src/main/kotlin/com/jetbrains/rider/aspire/sessionHost/SessionExecutableFactory.kt
@@ -107,8 +107,8 @@ class SessionExecutableFactory(private val project: Project) {
             executableParams.tfm ?: output.tfm,
             executableParams.workingDirectoryPath ?: workingDirectory,
             executableParams.commandLineArgumentString ?: arguments,
-            false,
-            false,
+            useMonoRuntime = false,
+            useExternalConsole = false,
             executableParams.environmentVariables,
             false,
             browserAction,
@@ -167,8 +167,8 @@ class SessionExecutableFactory(private val project: Project) {
             executableParams.tfm ?: properties.targetFramework,
             executableParams.workingDirectoryPath ?: workingDirectory,
             executableParams.commandLineArgumentString ?: arguments,
-            false,
-            false,
+            useMonoRuntime = false,
+            useExternalConsole = false,
             executableParams.environmentVariables,
             false,
             browserAction,

diff --git a/...om/jetbrains/rider/aspire/sessionHost/wasmHost/WasmHostProjectSessionDebugProfileState.kt b/...om/jetbrains/rider/aspire/sessionHost/wasmHost/WasmHostProjectSessionDebugProfileState.kt
@@ -18,7 +18,6 @@ import com.jetbrains.rider.debugger.wasm.BrowserHub
 import com.jetbrains.rider.run.configurations.HotReloadEnvironmentBuilder
 import com.jetbrains.rider.runtime.DotNetExecutable
 import com.jetbrains.rider.runtime.dotNetCore.DotNetCoreRuntime
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import java.nio.file.Path
 import kotlin.io.path.absolutePathString
 

diff --git a/src/main/kotlin/com/jetbrains/rider/aspire/util/MSBuildPropertyService.kt b/src/main/kotlin/com/jetbrains/rider/aspire/util/MSBuildPropertyService.kt
@@ -116,7 +116,13 @@ class MSBuildPropertyService(private val project: Project) {
             }
         }
 
-        return RdTargetFrameworkId(versionInfo, ".NETCoreApp", targetFramework, true, false)
+        return RdTargetFrameworkId(
+            versionInfo,
+            ".NETCoreApp",
+            targetFramework,
+            isNetCoreApp = true,
+            isNetFramework = false
+        )
     }
 
     private fun getExecutablePath(runCommand: String): Path? {