Enabled region location drop down

Build/Bicep/FunctionApps.bicep

@@ -34,8 +34,10 @@ param SessionHostResourceGroupName string = ''
 @description('Required: Yes | Name of the Azure Virtual Desktop Host Pool.')
 param HostPoolName string
 
-@description('Required: No | URL of the FunctionApp.zip file. This is the zip file containing the Function App code. | Default: The latest release of the Function App code.')
-param FunctionAppZipUrl string = 'https://github.com/WillyMoselhy/AVDReplacementPlans/releases/download/v0.1.5/FunctionApp.zip' // TODO - Update this to the new URL under Azure Org
+@description('Required: No | URL of the FunctionApp.zip package. By default, this is derived from the current template URL so it follows the deployed repo branch automatically.')
+param FunctionAppZipUrl string = contains(deployment().properties, 'templateLink') && !empty(deployment().properties.templateLink.uri)
+  ? uri(replace(split(deployment().properties.templateLink.uri, '?')[0], 'DeployAVDSessionHostReplacer.json', ''), '../../FunctionApp/FunctionApp.zip')
+  : 'https://github.com/WillyMoselhy/AVDReplacementPlans/releases/download/v0.1.5/FunctionApp.zip'
 
 @description('Required: No | If true, will apply tags for Include In Auto Replace and Deployment Timestamp to existing session hosts. This will not enable automatic deletion of existing session hosts. | Default: True.')
 param FixSessionHostTags bool = true
@@ -82,6 +84,9 @@ param SubnetId string
 @description('Required: No | Number of digits to use for the instance number of the session hosts (eg. AVDVM-01). | Default: 2')
 param SessionHostInstanceNumberPadding int = 2
 
+@description('Required: No | Minimum numeric suffix for managed session hosts. Hosts below this suffix are ignored when calculating how many new hosts to deploy. | Default: 1025')
+param ManagedSessionHostMinSuffix int = 1025
+
 @description('Required: No | If true, will replace session hosts when a new image version is detected. | Default: true')
 param ReplaceSessionHostOnNewImageVersion bool = true
 
@@ -106,6 +111,10 @@ var varFunctionAppSettings = [
     name: 'FUNCTIONS_WORKER_RUNTIME'
     value: 'powershell'
   }
+  {
+    name: 'AzureWebJobs.timerTrigger1.Disabled'
+    value: '1'
+  }
   {
     name: 'AzureWebJobsStorage'
     value: 'DefaultEndpointsProtocol=https;AccountName=${storageAccount.name};EndpointSuffix=${environment().suffixes.storage};AccountKey=${storageAccount.listKeys().keys[0].value}'
@@ -170,6 +179,10 @@ var varFunctionAppSettings = [
     name: '_SessionHostInstanceNumberPadding'
     value: SessionHostInstanceNumberPadding
   }
+  {
+    name: '_ManagedSessionHostMinSuffix'
+    value: ManagedSessionHostMinSuffix
+  }
   {
     name: '_TargetSessionHostCount'
     value: TargetSessionHostCount
@@ -286,7 +299,7 @@ resource functionApp 'Microsoft.Web/sites@2022-03-01' = {
     serverFarmId: appServicePlan.id
     siteConfig: {
       use32BitWorkerProcess: false
-      powerShellVersion: '7.2'
+      powerShellVersion: '7.4'
       netFrameworkVersion: 'v6.0'
       appSettings: varFunctionAppSettings
       ftpsState: 'Disabled'

FunctionApp/FunctionParameters.psd1

@@ -9,6 +9,7 @@
     _IncludePreExistingSessionHosts               = @{Required = $false ; Type = 'bool  '  ; Default = $false                             ; Description = 'When enabled, the Session Host Replacer will automatically consider pre-existing VMs for replacement if they meet the criteria by setting the IncludeInAutomation tag to True during the first run. When disabled, the session hosts are not counted as part of the target number of VMs. You can manually include a VM after deployment by updating its tag.' }
     _SHRDeploymentPrefix                          = @{Required = $false ; Type = 'string'  ; Default = 'AVDSessionHostReplacer'           ; Description = '' }
     _SessionHostInstanceNumberPadding             = @{Required = $false ; Type = 'int   '  ; Default = 2                                  ; Description = '' }
+    _ManagedSessionHostMinSuffix                  = @{Required = $false ; Type = 'int   '  ; Default = 1025                               ; Description = 'Minimum numeric suffix to consider when calculating target host count and allocating new VM names.' }
     _ReplaceSessionHostOnNewImageVersion          = @{Required = $false ; Type = 'bool  '  ; Default = $true                              ; Description = '' }
     _ReplaceSessionHostOnNewImageVersionDelayDays = @{Required = $false ; Type = 'int   '  ; Default = 0                                  ; Description = '' }
     _VMNamesTemplateParameterName                 = @{Required = $false ; Type = 'string'  ; Default = 'VMNames'                          ; Description = 'The name of the array parameter used in the Session Host deployment template to define the VM names. Default is "VMNames"' }

FunctionApp/Modules/SessionHostReplacer/functions/Deploy-SHRSessionHost.ps1

@@ -25,6 +25,9 @@ function Deploy-SHRSessionHost {
         [Parameter()]
         [int] $SessionHostInstanceNumberPadding = (Get-FunctionConfig _SessionHostInstanceNumberPadding),
 
+        [Parameter()]
+        [int] $ManagedSessionHostMinSuffix = (Get-FunctionConfig _ManagedSessionHostMinSuffix),
+
         [Parameter()]
         [string] $DeploymentPrefix = (Get-FunctionConfig _SHRDeploymentPrefix),
 
@@ -51,13 +54,14 @@ function Deploy-SHRSessionHost {
 
     # Calculate Session Host Names
     Write-PSFMessage -Level Host -Message "Existing session host VM names: {0}" -StringValues ($ExistingSessionHostVMNames -join ',')
+    $vmNumber = [Math]::Max(1, $ManagedSessionHostMinSuffix)
     [array] $sessionHostNames = for ($i = 0; $i -lt $NewSessionHostsCount; $i++) {
-        $vmNumber = 1
         While (("$SessionHostNamePrefix$SessionHostNameSeparator{0:d$SessionHostInstanceNumberPadding}" -f $vmNumber) -in $ExistingSessionHostVMNames) {
             $vmNumber++
         }
         $vmName = "$SessionHostNamePrefix$SessionHostNameSeparator{0:d$SessionHostInstanceNumberPadding}" -f $vmNumber
         $ExistingSessionHostVMNames += $vmName
+        $vmNumber++
         $vmName
     }
     Write-PSFMessage -Level Host -Message "Creating session host(s) {0}" -StringValues ($sessionHostNames -join ',')