Skip to content

Commit

Permalink
Merge pull request #976 from JetBrains/rival/vo-core-tools-path
Browse files Browse the repository at this point in the history
Use core tools `v4` path from the settings for the `v0` `AzureFunctionsVersion` property
  • Loading branch information
rafaelldi authored Dec 9, 2024
2 parents 815842f + bf4d804 commit 7a1a1da
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
4 changes: 4 additions & 0 deletions PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

## [Unreleased]

### Fixed

- Use core tools `v4` path from the settings for the `v0` `AzureFunctionsVersion` property ([RIDER-120285](https://youtrack.jetbrains.com/issue/RIDER-120285))

## [4.3.6] - 2024-12-09

### Fixed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,18 @@ class FunctionCoreToolsManager {
fun getFunctionCoreToolsPathForVersion(azureFunctionsVersion: String): Path? {
val settings = AzureFunctionSettings.getInstance()
val coreToolsPathEntries = settings.azureCoreToolsPathEntries
val coreToolsPathFromSettings = coreToolsPathEntries
.firstOrNull { it.functionsVersion.equals(azureFunctionsVersion, ignoreCase = true) }
?.coreToolsPath
?.let(::resolveCoreToolsPathFromSettings)
val coreToolsPathFromSettings =
if (azureFunctionsVersion.equals("v0", true)) {
coreToolsPathEntries
.firstOrNull { it.functionsVersion.equals("v4", ignoreCase = true) }
?.coreToolsPath
?.let(::resolveCoreToolsPathFromSettings)
} else {
coreToolsPathEntries
.firstOrNull { it.functionsVersion.equals(azureFunctionsVersion, ignoreCase = true) }
?.coreToolsPath
?.let(::resolveCoreToolsPathFromSettings)
}
if (coreToolsPathFromSettings?.exists() == true) {
LOG.trace { "Get Azure Function core tools path from the settings: $coreToolsPathFromSettings" }
return coreToolsPathFromSettings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.6
pluginVersion = 4.3.7

# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild = 243
Expand Down

0 comments on commit 7a1a1da

Please sign in to comment.