diff --git a/PSModuleDevelopment/PSModuleDevelopment.psd1 b/PSModuleDevelopment/PSModuleDevelopment.psd1 index 9bc27bf..231bd26 100644 --- a/PSModuleDevelopment/PSModuleDevelopment.psd1 +++ b/PSModuleDevelopment/PSModuleDevelopment.psd1 @@ -5,7 +5,7 @@ # Version number of this module. - ModuleVersion = '2.2.13.216' + ModuleVersion = '2.2.13.217' # ID used to uniquely identify this module GUID = '37dd5fce-e7b5-4d57-ac37-832055ce49d6' diff --git a/PSModuleDevelopment/changelog.md b/PSModuleDevelopment/changelog.md index e34c8bc..fb6ef85 100644 --- a/PSModuleDevelopment/changelog.md +++ b/PSModuleDevelopment/changelog.md @@ -1,5 +1,9 @@ # Changelog +## 2.3.13.217 (2026-03-30) + ++ Fix: Template AzureFunction - fails to detect injected dependencies in FlexConsumption mode + ## 2.2.13.216 (2026-01-16) + Upd: Template AzureFunction - Update host.json extension bundle version to `[4.*, 5.0.0)` diff --git a/templates/AzureFunction/PSMDTemplate.ps1 b/templates/AzureFunction/PSMDTemplate.ps1 index 44476f3..598f894 100644 --- a/templates/AzureFunction/PSMDTemplate.ps1 +++ b/templates/AzureFunction/PSMDTemplate.ps1 @@ -1,6 +1,6 @@ @{ TemplateName = 'AzureFunction' - Version = "2.0.5" + Version = "2.0.6" AutoIncrementVersion = $true Tags = 'azure', 'function' Author = 'Friedrich Weinmann' diff --git a/templates/AzureFunction/build/build.ps1 b/templates/AzureFunction/build/build.ps1 index c111281..9bd9158 100644 --- a/templates/AzureFunction/build/build.ps1 +++ b/templates/AzureFunction/build/build.ps1 @@ -32,7 +32,7 @@ Copy-Item -Path "$workingDirectory/function/*" -Destination $buildFolder.FullNam $requiredModules = (Import-PowerShellDataFile -Path "$workingDirectory/þnameþ/þnameþ.psd1").RequiredModules foreach ($module in $requiredModules) { if ($module -is [string]) { - Save-Module -Name $module -Path "$($buildFolder.FullName)/modules" -Force -Repository $Repository + Save-Module -Name $module -Path "$($buildFolder.FullName)/Modules" -Force -Repository $Repository continue } @@ -40,7 +40,7 @@ foreach ($module in $requiredModules) { if ($module.RequiredVersion) { $saveParam.RequiredVersion = $module.RequiredVersion } elseif ($module.ModuleVersion) { $saveParam.MinimumVersion = $module.ModuleVersion } - Save-Module @saveParam -Path "$($buildFolder.FullName)/modules" -Force -Repository $Repository + Save-Module @saveParam -Path "$($buildFolder.FullName)/Modules" -Force -Repository $Repository } #region Handle the Requirements for Flex Consumption Plans @@ -66,7 +66,7 @@ if ($config.General.FlexConsumption) { # Inject New Dependencies foreach ($module in $requiredModules) { - Save-Module @module -Path "$($buildFolder.FullName)/modules" -Force -Repository $Repository + Save-Module @module -Path "$($buildFolder.FullName)/Modules" -Force -Repository $Repository } # Disable Managed Dependencies @@ -78,9 +78,9 @@ if ($config.General.FlexConsumption) { #endregion Handle the Requirements for Flex Consumption Plans # Process Function Module -Copy-Item -Path "$workingDirectory/þnameþ" -Destination "$($buildFolder.FullName)/modules" -Force -Recurse -$commands = Get-ChildItem -Path "$($buildFolder.FullName)/modules/þnameþ/Functions" -Recurse -Filter *.ps1 | ForEach-Object BaseName -Update-ModuleManifest -Path "$($buildFolder.FullName)/modules/þnameþ/þnameþ.psd1" -FunctionsToExport $commands +Copy-Item -Path "$workingDirectory/þnameþ" -Destination "$($buildFolder.FullName)/Modules" -Force -Recurse +$commands = Get-ChildItem -Path "$($buildFolder.FullName)/Modules/þnameþ/Functions" -Recurse -Filter *.ps1 | ForEach-Object BaseName +Update-ModuleManifest -Path "$($buildFolder.FullName)/Modules/þnameþ/þnameþ.psd1" -FunctionsToExport $commands #endregion Handle Modules #region Triggers diff --git a/templates/AzureFunction/build/psf-build.ps1 b/templates/AzureFunction/build/psf-build.ps1 index 67c8367..3e49f1d 100644 --- a/templates/AzureFunction/build/psf-build.ps1 +++ b/templates/AzureFunction/build/psf-build.ps1 @@ -34,13 +34,13 @@ Copy-Item -Path "$workingDirectory/function/*" -Destination $buildFolder.FullNam $requiredModules = (Import-PowerShellDataFile -Path "$workingDirectory/þnameþ/þnameþ.psd1").RequiredModules foreach ($module in $requiredModules) { if ($module -is [string]) { - Save-PSFModule -Name $module -Path "$($buildFolder.FullName)/modules" -Force -Repository $Repository + Save-PSFModule -Name $module -Path "$($buildFolder.FullName)/Modules" -Force -Repository $Repository } else { $versionParam = @{} if ($module.RequiredVersion) { $versionParam.Version = $module.RequiredVersion } elseif ($module.ModuleVersion) { $versionParam.Version = "[$($module.ModuleVersion)-" } - Save-PSFModule -Name $module.ModuleName @versionParam -Path "$($buildFolder.FullName)/modules" -Force -Repository $Repository + Save-PSFModule -Name $module.ModuleName @versionParam -Path "$($buildFolder.FullName)/Modules" -Force -Repository $Repository } } @@ -66,7 +66,7 @@ if ($config.General.FlexConsumption) { # Inject New Dependencies foreach ($module in $requiredModules) { - Save-PSFModule @module -Path "$($buildFolder.FullName)/modules" -Force -Repository $Repository + Save-PSFModule @module -Path "$($buildFolder.FullName)/Modules" -Force -Repository $Repository } # Disable Managed Dependencies @@ -78,9 +78,9 @@ if ($config.General.FlexConsumption) { #endregion Handle the Requirements for Flex Consumption Plans # Process Function Module -Copy-Item -Path "$workingDirectory/þnameþ" -Destination "$($buildFolder.FullName)/modules" -Force -Recurse -$commands = Get-ChildItem -Path "$($buildFolder.FullName)/modules/þnameþ/Functions" -Recurse -Filter *.ps1 | ForEach-Object BaseName -Update-PSFModuleManifest -Path "$($buildFolder.FullName)/modules/þnameþ/þnameþ.psd1" -FunctionsToExport $commands +Copy-Item -Path "$workingDirectory/þnameþ" -Destination "$($buildFolder.FullName)/Modules" -Force -Recurse +$commands = Get-ChildItem -Path "$($buildFolder.FullName)/Modules/þnameþ/Functions" -Recurse -Filter *.ps1 | ForEach-Object BaseName +Update-PSFModuleManifest -Path "$($buildFolder.FullName)/Modules/þnameþ/þnameþ.psd1" -FunctionsToExport $commands #endregion Handle Modules #region Triggers