Use the AzureFunctionsVersion MSBuild property value to choose the …

…proper func cli
JetBrains · Aug 16, 2024 · 5b9c2c5 · 5b9c2c5
1 parent f981c72
commit 5b9c2c5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md b/PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md
@@ -8,6 +8,10 @@
 
 - Option to disable authentication cache
 
+### Fixed
+
+- Plugin uses `v4` func cli even if the value of the MSBuild property is `v0`
+
 ## [4.0.1] - 2024-08-16
 
 ### Changed

diff --git a/...n/kotlin/com/microsoft/azure/toolkit/intellij/legacy/PublishableProjectModelExtensions.kt b/...n/kotlin/com/microsoft/azure/toolkit/intellij/legacy/PublishableProjectModelExtensions.kt
@@ -68,7 +68,7 @@ suspend fun PublishableProjectModel.getFunctionStack(
         .getInstance(project)
         .getFunctionLocalSettings(this)
     val workerRuntime = functionLocalSettings?.values?.workerRuntime ?: FunctionWorkerRuntime.DOTNET_ISOLATED
-    val coreToolsVersion = withContext(Dispatchers.EDT) {
+    val azureFunctionVersion = withContext(Dispatchers.EDT) {
         FunctionCoreToolsMsBuildService
             .getInstance()
             .requestAzureFunctionsVersion(project, this@getFunctionStack.projectFilePath)
@@ -78,11 +78,19 @@ suspend fun PublishableProjectModel.getFunctionStack(
     val dotnetVersion = getProjectDotNetVersion(project, this)
     return FunctionRuntimeStack(
         workerRuntime.value(),
-        "~$coreToolsVersion",
+        functionRuntimeVersionFromProjectProperty(azureFunctionVersion),
         if (operatingSystem == OperatingSystem.LINUX) "${workerRuntime.value()}|$dotnetVersion" else ""
     )
 }
 
+private fun functionRuntimeVersionFromProjectProperty(azureFunctionVersion: String) = when (azureFunctionVersion) {
+    "4" -> "~4"
+    "3" -> "~3"
+    "2" -> "~2"
+    "1" -> "~1"
+    else -> "~4"
+}
+
 private fun getProjectDotNetVersion(project: Project, publishableProject: PublishableProjectModel): String? {
     val currentFramework = getCurrentFrameworkId(project, publishableProject) ?: return null
     return netAppVersionRegex.find(currentFramework)?.groups?.get(1)?.value

diff --git a/...osoft/azure/toolkit/intellij/legacy/function/coreTools/FunctionCoreToolsMsBuildService.kt b/...osoft/azure/toolkit/intellij/legacy/function/coreTools/FunctionCoreToolsMsBuildService.kt
@@ -18,15 +18,9 @@ class FunctionCoreToolsMsBuildService {
         const val PROPERTY_AZURE_FUNCTIONS_VERSION = "AzureFunctionsVersion"
     }
 
-    suspend fun requestAzureFunctionsVersion(project: Project, projectFilePath: String): String? {
-        val functionVersion = project.solution.functionAppDaemonModel.getAzureFunctionsVersion
+    suspend fun requestAzureFunctionsVersion(project: Project, projectFilePath: String) =
+        project.solution
+            .functionAppDaemonModel
+            .getAzureFunctionsVersion
             .startSuspending(AzureFunctionsVersionRequest(projectFilePath))
-
-        //hack: sometimes we receive v0 even for v4 project
-        if (functionVersion == "v0") {
-            return "v4"
-        }
-
-        return functionVersion
-    }
 }