Merge pull request #962 from JetBrains/rival/reimplement-core-tool-ma…

…nager Reimplement core tool manager
JetBrains · Nov 19, 2024 · 66db71b · 66db71b
2 parents 0e14235 + b763355
commit 66db71b
Show file tree

Hide file tree

Showing 27 changed files with 689 additions and 520 deletions.
diff --git a/PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md b/PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ## [Unreleased]
 
+### Changed
+
+- Reimplement Function core tools management
+
 ## [4.3.4] - 2024-11-13
 
 ### Fixed

diff --git a/...n/kotlin/com/microsoft/azure/toolkit/intellij/legacy/PublishableProjectModelExtensions.kt b/...n/kotlin/com/microsoft/azure/toolkit/intellij/legacy/PublishableProjectModelExtensions.kt
@@ -12,7 +12,7 @@ import com.intellij.openapi.project.Project
 import com.jetbrains.rider.model.PublishableProjectModel
 import com.jetbrains.rider.model.projectModelTasks
 import com.jetbrains.rider.projectView.solution
-import com.microsoft.azure.toolkit.intellij.legacy.function.coreTools.FunctionCoreToolsMsBuildService
+import com.microsoft.azure.toolkit.intellij.legacy.function.coreTools.FunctionsVersionMsBuildService
 import com.microsoft.azure.toolkit.intellij.legacy.function.localsettings.FunctionLocalSettingsService
 import com.microsoft.azure.toolkit.intellij.legacy.function.localsettings.FunctionWorkerRuntime
 import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem
@@ -69,9 +69,9 @@ suspend fun PublishableProjectModel.getFunctionStack(
         .getFunctionLocalSettings(this)
     val workerRuntime = functionLocalSettings?.values?.workerRuntime ?: FunctionWorkerRuntime.DOTNET_ISOLATED
     val azureFunctionVersion = withContext(Dispatchers.EDT) {
-        FunctionCoreToolsMsBuildService
-            .getInstance()
-            .requestAzureFunctionsVersion(project, this@getFunctionStack.projectFilePath)
+        FunctionsVersionMsBuildService
+            .getInstance(project)
+            .requestAzureFunctionsVersion(this@getFunctionStack.projectFilePath)
             ?.trimStart('v', 'V')
             ?: "4"
     }

diff --git a/...oolkit/intellij/legacy/function/codeInspection/msbuild/AzureFunctionsVersionInspection.kt b/...oolkit/intellij/legacy/function/codeInspection/msbuild/AzureFunctionsVersionInspection.kt
@@ -14,7 +14,7 @@ import com.intellij.psi.xml.XmlElementType
 import com.intellij.psi.xml.XmlTag
 import com.intellij.xml.util.XmlUtil
 import com.microsoft.azure.toolkit.intellij.legacy.function.FUNCTIONS_CORE_TOOLS_KNOWN_SUPPORTED_VERSIONS
-import com.microsoft.azure.toolkit.intellij.legacy.function.coreTools.FunctionCoreToolsMsBuildService.Companion.PROPERTY_AZURE_FUNCTIONS_VERSION
+import com.microsoft.azure.toolkit.intellij.legacy.function.coreTools.FunctionsVersionMsBuildService.Companion.PROPERTY_AZURE_FUNCTIONS_VERSION
 
 class AzureFunctionsVersionInspection : XmlSuppressableInspectionTool() {
     override fun buildVisitor(holder: ProblemsHolder, isOnTheFly: Boolean) = object : XmlElementVisitor() {

diff --git a/...n/kotlin/com/microsoft/azure/toolkit/intellij/legacy/function/coreTools/FileExtensions.kt b/...n/kotlin/com/microsoft/azure/toolkit/intellij/legacy/function/coreTools/FileExtensions.kt
diff --git a/...n/com/microsoft/azure/toolkit/intellij/legacy/function/coreTools/FunctionCoreToolsInfo.kt b/...n/com/microsoft/azure/toolkit/intellij/legacy/function/coreTools/FunctionCoreToolsInfo.kt
diff --git a/...crosoft/azure/toolkit/intellij/legacy/function/coreTools/FunctionCoreToolsInfoProvider.kt b/...crosoft/azure/toolkit/intellij/legacy/function/coreTools/FunctionCoreToolsInfoProvider.kt