Azure · danycontre · Mar 20, 2025 · Mar 6, 2025 · Mar 6, 2025 · Mar 6, 2025
diff --git a/avm/1.0.0/res/automation/automation-account/main.bicep b/avm/1.0.0/res/automation/automation-account/main.bicep
@@ -489,7 +489,7 @@ module automationAccount_privateEndpoints 'br/public:avm/res/network/private-end
       enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry
       location: privateEndpoint.?location ?? reference(
         split(privateEndpoint.subnetResourceId, '/subnets/')[0],
-        '2020-06-01',
+        '2024-06-01',
         'Full'
       ).location
       lock: privateEndpoint.?lock ?? lock

diff --git a/avm/1.0.0/res/automation/automation-account/main.json b/avm/1.0.0/res/automation/automation-account/main.json
@@ -2538,7 +2538,7 @@
             "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'enableTelemetry'), parameters('enableTelemetry'))]"
           },
           "location": {
-            "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'location'), reference(split(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()].subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location)]"
+            "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'location'), reference(split(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()].subnetResourceId, '/subnets/')[0], '2024-03-01', 'Full').location)]"
           },
           "lock": {
             "value": "[coalesce(tryGet(coalesce(parameters('privateEndpoints'), createArray())[copyIndex()], 'lock'), parameters('lock'))]"

diff --git a/avm/1.0.0/res/automation/automation-account/tests/e2e/max/dependencies.bicep b/avm/1.0.0/res/automation/automation-account/tests/e2e/max/dependencies.bicep
@@ -41,11 +41,11 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
   }
 }
 
-resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
+resource privateDNSZone 'Microsoft.Network/privateDnsZones@2024-06-01' = {
   name: 'privatelink.azure-automation.net'
   location: 'global'
 
-  resource virtualNetworkLinks 'virtualNetworkLinks@2020-06-01' = {
+  resource virtualNetworkLinks 'virtualNetworkLinks@2024-06-01' = {
     name: '${virtualNetwork.name}-vnetlink'
     location: 'global'
     properties: {

diff --git a/avm/1.0.0/res/automation/automation-account/tests/e2e/waf-aligned/dependencies.bicep b/avm/1.0.0/res/automation/automation-account/tests/e2e/waf-aligned/dependencies.bicep
@@ -29,11 +29,11 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = {
   }
 }
 
-resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
+resource privateDNSZone 'Microsoft.Network/privateDnsZones@2024-06-01' = {
   name: 'privatelink.azure-automation.net'
   location: 'global'
 
-  resource virtualNetworkLinks 'virtualNetworkLinks@2020-06-01' = {
+  resource virtualNetworkLinks 'virtualNetworkLinks@2024-06-01' = {
     name: '${virtualNetwork.name}-vnetlink'
     location: 'global'
     properties: {

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/README.md b/avm/1.0.0/res/desktop-virtualization/application-group/README.md
@@ -17,8 +17,8 @@ This module deploys an Azure Virtual Desktop Application Group.
 | :-- | :-- |
 | `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) |
 | `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) |
-| `Microsoft.DesktopVirtualization/applicationGroups` | [2024-04-08-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups) |
-| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2024-04-08-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups/applications) |
+| `Microsoft.DesktopVirtualization/applicationGroups` | [2023-09-05](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups) |
+| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2023-09-05](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups/applications) |
 | `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) |
 
 ## Usage examples

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/application/README.md b/avm/1.0.0/res/desktop-virtualization/application-group/application/README.md
@@ -14,7 +14,7 @@ This module deploys an Azure Virtual Desktop Application Group Application.
 
 | Resource Type | API Version |
 | :-- | :-- |
-| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2024-04-08-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups/applications) |
+| `Microsoft.DesktopVirtualization/applicationGroups/applications` | [2023-09-05](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/applicationGroups/applications) |
 
 ## Parameters
 

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/application/main.bicep b/avm/1.0.0/res/desktop-virtualization/application-group/application/main.bicep
@@ -37,11 +37,11 @@ param iconPath string = ''
 @sys.description('Optional. Index of the icon.')
 param iconIndex int = 0
 
-resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2024-04-08-preview' existing = {
+resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2023-09-05' existing = {
   name: applicationGroupName
 }
 
-resource application 'Microsoft.DesktopVirtualization/applicationGroups/applications@2024-04-08-preview' = {
+resource application 'Microsoft.DesktopVirtualization/applicationGroups/applications@2023-09-05' = {
   name: name
   parent: appGroup
   properties: {

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/application/main.json b/avm/1.0.0/res/desktop-virtualization/application-group/application/main.json
@@ -4,8 +4,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.26.54.24096",
-      "templateHash": "11159515031632739969"
+      "version": "0.33.93.31351",
+      "templateHash": "3961073075950222669"
     },
     "name": "Azure Virtual Desktop Application Group Application",
     "description": "This module deploys an Azure Virtual Desktop Application Group Application.",

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/main.bicep b/avm/1.0.0/res/desktop-virtualization/application-group/main.bicep
@@ -87,11 +87,11 @@ resource avmTelemetry 'Microsoft.Resources/deployments@2023-07-01' =
     }
   }
 
-resource appGroup_hostpool 'Microsoft.DesktopVirtualization/hostPools@2024-04-08-preview' existing = {
+resource appGroup_hostpool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' existing = {
   name: hostpoolName
 }
 
-resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2024-04-08-preview' = {
+resource appGroup 'Microsoft.DesktopVirtualization/applicationGroups@2023-09-05' = {
   name: name
   location: location
   tags: tags
@@ -109,14 +109,14 @@ module appGroup_applications 'application/main.bicep' = [
     params: {
       name: application.name
       applicationGroupName: appGroup.name
-      description: contains(application, 'description') ? application.description : ''
-      friendlyName: contains(application, 'friendlyName') ? application.friendlyName : appGroup.name
+      description: application.?description ?? ''
+      friendlyName: application.?friendlyName ?? appGroup.name
       filePath: application.filePath
-      commandLineSetting: contains(application, 'commandLineSetting') ? application.commandLineSetting : 'DoNotAllow'
-      commandLineArguments: contains(application, 'commandLineArguments') ? application.commandLineArguments : ''
-      showInPortal: contains(application, 'showInPortal') ? application.showInPortal : false
-      iconPath: contains(application, 'iconPath') ? application.iconPath : application.filePath
-      iconIndex: contains(application, 'iconIndex') ? application.iconIndex : 0
+      commandLineSetting: application.?commandLineSetting ?? 'DoNotAllow'
+      commandLineArguments: application.?commandLineArguments ?? ''
+      showInPortal: application.?showInPortal ?? false
+      iconPath: application.?iconPath ?? application.filePath
+      iconIndex: application.?iconIndex ?? 0
     }
   }
 ]
@@ -137,11 +137,9 @@ resource appGroup_roleAssignments 'Microsoft.Authorization/roleAssignments@2022-
   for (roleAssignment, index) in (roleAssignments ?? []): {
     name: guid(appGroup.id, roleAssignment.principalId, roleAssignment.roleDefinitionIdOrName)
     properties: {
-      roleDefinitionId: contains(builtInRoleNames, roleAssignment.roleDefinitionIdOrName)
-        ? builtInRoleNames[roleAssignment.roleDefinitionIdOrName]
-        : contains(roleAssignment.roleDefinitionIdOrName, '/providers/Microsoft.Authorization/roleDefinitions/')
+      roleDefinitionId: builtInRoleNames[?roleAssignment.roleDefinitionIdOrName] ?? (contains(roleAssignment.roleDefinitionIdOrName, '/providers/Microsoft.Authorization/roleDefinitions/')
             ? roleAssignment.roleDefinitionIdOrName
-            : subscriptionResourceId('Microsoft.Authorization/roleDefinitions', roleAssignment.roleDefinitionIdOrName)
+            : subscriptionResourceId('Microsoft.Authorization/roleDefinitions', roleAssignment.roleDefinitionIdOrName))
       principalId: roleAssignment.principalId
       description: roleAssignment.?description
       principalType: roleAssignment.?principalType

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/main.json b/avm/1.0.0/res/desktop-virtualization/application-group/main.json
@@ -5,8 +5,8 @@
   "metadata": {
     "_generator": {
       "name": "bicep",
-      "version": "0.33.13.18514",
-      "templateHash": "14213682580568647702"
+      "version": "0.33.93.31351",
+      "templateHash": "11120131172578458858"
     },
     "name": "Azure Virtual Desktop Application Group",
     "description": "This module deploys an Azure Virtual Desktop Application Group.",
@@ -304,12 +304,12 @@
     "appGroup_hostpool": {
       "existing": true,
       "type": "Microsoft.DesktopVirtualization/hostPools",
-      "apiVersion": "2024-04-08-preview",
+      "apiVersion": "2023-09-05",
       "name": "[parameters('hostpoolName')]"
     },
     "appGroup": {
       "type": "Microsoft.DesktopVirtualization/applicationGroups",
-      "apiVersion": "2024-04-08-preview",
+      "apiVersion": "2023-09-05",
       "name": "[parameters('name')]",
       "location": "[parameters('location')]",
       "tags": "[parameters('tags')]",
@@ -330,7 +330,7 @@
       "scope": "[format('Microsoft.DesktopVirtualization/applicationGroups/{0}', parameters('name'))]",
       "name": "[guid(resourceId('Microsoft.DesktopVirtualization/applicationGroups', parameters('name')), coalesce(parameters('roleAssignments'), createArray())[copyIndex()].principalId, coalesce(parameters('roleAssignments'), createArray())[copyIndex()].roleDefinitionIdOrName)]",
       "properties": {
-        "roleDefinitionId": "[if(contains(variables('builtInRoleNames'), coalesce(parameters('roleAssignments'), createArray())[copyIndex()].roleDefinitionIdOrName), variables('builtInRoleNames')[coalesce(parameters('roleAssignments'), createArray())[copyIndex()].roleDefinitionIdOrName], if(contains(coalesce(parameters('roleAssignments'), createArray())[copyIndex()].roleDefinitionIdOrName, '/providers/Microsoft.Authorization/roleDefinitions/'), coalesce(parameters('roleAssignments'), createArray())[copyIndex()].roleDefinitionIdOrName, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', coalesce(parameters('roleAssignments'), createArray())[copyIndex()].roleDefinitionIdOrName)))]",
+        "roleDefinitionId": "[coalesce(tryGet(variables('builtInRoleNames'), coalesce(parameters('roleAssignments'), createArray())[copyIndex()].roleDefinitionIdOrName), if(contains(coalesce(parameters('roleAssignments'), createArray())[copyIndex()].roleDefinitionIdOrName, '/providers/Microsoft.Authorization/roleDefinitions/'), coalesce(parameters('roleAssignments'), createArray())[copyIndex()].roleDefinitionIdOrName, subscriptionResourceId('Microsoft.Authorization/roleDefinitions', coalesce(parameters('roleAssignments'), createArray())[copyIndex()].roleDefinitionIdOrName)))]",
         "principalId": "[coalesce(parameters('roleAssignments'), createArray())[copyIndex()].principalId]",
         "description": "[tryGet(coalesce(parameters('roleAssignments'), createArray())[copyIndex()], 'description')]",
         "principalType": "[tryGet(coalesce(parameters('roleAssignments'), createArray())[copyIndex()], 'principalType')]",
@@ -394,25 +394,39 @@
           "applicationGroupName": {
             "value": "[parameters('name')]"
           },
-          "description": "[if(contains(parameters('applications')[copyIndex()], 'description'), createObject('value', parameters('applications')[copyIndex()].description), createObject('value', ''))]",
-          "friendlyName": "[if(contains(parameters('applications')[copyIndex()], 'friendlyName'), createObject('value', parameters('applications')[copyIndex()].friendlyName), createObject('value', parameters('name')))]",
+          "description": {
+            "value": "[coalesce(tryGet(parameters('applications')[copyIndex()], 'description'), '')]"
+          },
+          "friendlyName": {
+            "value": "[coalesce(tryGet(parameters('applications')[copyIndex()], 'friendlyName'), parameters('name'))]"
+          },
           "filePath": {
             "value": "[parameters('applications')[copyIndex()].filePath]"
           },
-          "commandLineSetting": "[if(contains(parameters('applications')[copyIndex()], 'commandLineSetting'), createObject('value', parameters('applications')[copyIndex()].commandLineSetting), createObject('value', 'DoNotAllow'))]",
-          "commandLineArguments": "[if(contains(parameters('applications')[copyIndex()], 'commandLineArguments'), createObject('value', parameters('applications')[copyIndex()].commandLineArguments), createObject('value', ''))]",
-          "showInPortal": "[if(contains(parameters('applications')[copyIndex()], 'showInPortal'), createObject('value', parameters('applications')[copyIndex()].showInPortal), createObject('value', false()))]",
-          "iconPath": "[if(contains(parameters('applications')[copyIndex()], 'iconPath'), createObject('value', parameters('applications')[copyIndex()].iconPath), createObject('value', parameters('applications')[copyIndex()].filePath))]",
-          "iconIndex": "[if(contains(parameters('applications')[copyIndex()], 'iconIndex'), createObject('value', parameters('applications')[copyIndex()].iconIndex), createObject('value', 0))]"
+          "commandLineSetting": {
+            "value": "[coalesce(tryGet(parameters('applications')[copyIndex()], 'commandLineSetting'), 'DoNotAllow')]"
+          },
+          "commandLineArguments": {
+            "value": "[coalesce(tryGet(parameters('applications')[copyIndex()], 'commandLineArguments'), '')]"
+          },
+          "showInPortal": {
+            "value": "[coalesce(tryGet(parameters('applications')[copyIndex()], 'showInPortal'), false())]"
+          },
+          "iconPath": {
+            "value": "[coalesce(tryGet(parameters('applications')[copyIndex()], 'iconPath'), parameters('applications')[copyIndex()].filePath)]"
+          },
+          "iconIndex": {
+            "value": "[coalesce(tryGet(parameters('applications')[copyIndex()], 'iconIndex'), 0)]"
+          }
         },
         "template": {
           "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
           "contentVersion": "1.0.0.0",
           "metadata": {
             "_generator": {
               "name": "bicep",
-              "version": "0.33.13.18514",
-              "templateHash": "12429020349302903087"
+              "version": "0.33.93.31351",
+              "templateHash": "3961073075950222669"
             },
             "name": "Azure Virtual Desktop Application Group Application",
             "description": "This module deploys an Azure Virtual Desktop Application Group Application.",
@@ -494,7 +508,7 @@
           "resources": [
             {
               "type": "Microsoft.DesktopVirtualization/applicationGroups/applications",
-              "apiVersion": "2024-04-08-preview",
+              "apiVersion": "2023-09-05",
               "name": "[format('{0}/{1}', parameters('applicationGroupName'), parameters('name'))]",
               "properties": {
                 "description": "[parameters('description')]",
@@ -565,7 +579,7 @@
       "metadata": {
         "description": "The location of the scaling plan."
       },
-      "value": "[reference('appGroup', '2024-04-08-preview', 'full').location]"
+      "value": "[reference('appGroup', '2023-09-05', 'full').location]"
     }
   }
 }
diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/tests/e2e/defaults/dependencies.bicep b/avm/1.0.0/res/desktop-virtualization/application-group/tests/e2e/defaults/dependencies.bicep
@@ -4,7 +4,7 @@ param location string = resourceGroup().location
 @description('Required. The name of the Host Pool to create.')
 param hostPoolName string
 
-resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-08-preview' = {
+resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' = {
   name: hostPoolName
   location: location
   properties: {

diff --git a/avm/1.0.0/res/desktop-virtualization/application-group/tests/e2e/max/dependencies.bicep b/avm/1.0.0/res/desktop-virtualization/application-group/tests/e2e/max/dependencies.bicep
@@ -12,7 +12,7 @@ resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-
   location: location
 }
 
-resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-08-preview' = {
+resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' = {
   name: hostPoolName
   location: location
   properties: {

diff --git a/...0.0/res/desktop-virtualization/application-group/tests/e2e/waf-aligned/dependencies.bicep b/...0.0/res/desktop-virtualization/application-group/tests/e2e/waf-aligned/dependencies.bicep
@@ -4,7 +4,7 @@ param location string = resourceGroup().location
 @description('Required. The name of the Host Pool to create.')
 param hostPoolName string
 
-resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-08-preview' = {
+resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' = {
   name: hostPoolName
   location: location
   properties: {

diff --git a/avm/1.0.0/res/desktop-virtualization/host-pool/README.md b/avm/1.0.0/res/desktop-virtualization/host-pool/README.md
@@ -17,7 +17,7 @@ This module deploys an Azure Virtual Desktop Host Pool
 | :-- | :-- |
 | `Microsoft.Authorization/locks` | [2020-05-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-05-01/locks) |
 | `Microsoft.Authorization/roleAssignments` | [2022-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2022-04-01/roleAssignments) |
-| `Microsoft.DesktopVirtualization/hostPools` | [2024-04-08-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/hostPools) |
+| `Microsoft.DesktopVirtualization/hostPools` | [2023-09-05](https://learn.microsoft.com/en-us/azure/templates/Microsoft.DesktopVirtualization/2023-09-05/hostPools) |
 | `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) |
 | `Microsoft.Network/privateEndpoints` | [2023-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2023-04-01/privateEndpoints) |
 | `Microsoft.Network/privateEndpoints/privateDnsZoneGroups` | [2023-04-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Network/2023-04-01/privateEndpoints/privateDnsZoneGroups) |

diff --git a/avm/1.0.0/res/desktop-virtualization/host-pool/main.bicep b/avm/1.0.0/res/desktop-virtualization/host-pool/main.bicep
@@ -176,7 +176,7 @@ resource avmTelemetry 'Microsoft.Resources/deployments@2023-07-01' =
     }
   }
 
-resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-08-preview' = {
+resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' = {
   name: name
   location: location
   tags: tags
@@ -255,7 +255,7 @@ module hostPool_privateEndpoints 'br/public:avm/res/network/private-endpoint:0.4
       enableTelemetry: privateEndpoint.?enableTelemetry ?? enableTelemetry
       location: privateEndpoint.?location ?? reference(
         split(privateEndpoint.subnetResourceId, '/subnets/')[0],
-        '2020-06-01',
+        '2024-03-01',
         'Full'
       ).location
 //      lock: privateEndpoint.?lock ?? lock