From d6988e708d467f6c9d942f257d8e909d23c29377 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Mon, 20 Dec 2021 13:15:58 +0100
Subject: [PATCH 01/10] privdns order

---
 .../resourceRemoval/Initialize-DeploymentRemoval.ps1       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
index 54f8ad6d05..98ced6bfa7 100644
--- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
@@ -70,6 +70,13 @@ function Initialize-DeploymentRemoval {
                     )
                     break
                 }
+                'privateDnsZones' {
+                    $removalSequence += @(
+                        'Microsoft.Network/privateDnsZones/virtualNetworkLinks',
+                        'Microsoft.Network/privateDnsZones'
+                    )
+                    break
+                }
             }
 
             # Invoke removal

From 11f3738548f9669b8dac9b90775b04d3d6d3078a Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Mon, 20 Dec 2021 14:17:07 +0100
Subject: [PATCH 02/10] module name out

---
 .../pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
index 98ced6bfa7..e39242a987 100644
--- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
@@ -52,6 +52,7 @@ function Initialize-DeploymentRemoval {
 
         foreach ($deploymentName in $deploymentNames) {
             Write-Verbose ('Handling resource removal with deployment name [{0}]' -f $deploymentName) -Verbose
+            Write-Verbose ('Module name: [{0}]' -f $moduleName) -Verbose
             switch ($moduleName) {
                 'virtualWans' {
                     $removalSequence += @(
@@ -71,6 +72,7 @@ function Initialize-DeploymentRemoval {
                     break
                 }
                 'privateDnsZones' {
+
                     $removalSequence += @(
                         'Microsoft.Network/privateDnsZones/virtualNetworkLinks',
                         'Microsoft.Network/privateDnsZones'

From d61a62fccf37ea2ac2acb33e3fb79a0eb87586be Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Mon, 20 Dec 2021 15:01:10 +0100
Subject: [PATCH 03/10] removal prints

---
 .../resourceRemoval/Initialize-DeploymentRemoval.ps1          | 4 ++--
 .../resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1    | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
index e39242a987..5da5b7acda 100644
--- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
@@ -49,10 +49,11 @@ function Initialize-DeploymentRemoval {
             'Microsoft.Resources/resourceGroups',
             'Microsoft.Compute/virtualMachines'
         )
+        Write-Verbose ('Template file path: [{0}]' -f $templateFilePath) -Verbose
+        Write-Verbose ('Module name: [{0}]' -f $moduleName) -Verbose
 
         foreach ($deploymentName in $deploymentNames) {
             Write-Verbose ('Handling resource removal with deployment name [{0}]' -f $deploymentName) -Verbose
-            Write-Verbose ('Module name: [{0}]' -f $moduleName) -Verbose
             switch ($moduleName) {
                 'virtualWans' {
                     $removalSequence += @(
@@ -72,7 +73,6 @@ function Initialize-DeploymentRemoval {
                     break
                 }
                 'privateDnsZones' {
-
                     $removalSequence += @(
                         'Microsoft.Network/privateDnsZones/virtualNetworkLinks',
                         'Microsoft.Network/privateDnsZones'
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
index 076aa7ad06..356dc1d513 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
@@ -52,6 +52,7 @@ function Get-ResourceIdsOfDeploymentInner {
             if (Get-AzResourceGroup -Name $resourceGroupName -ErrorAction 'SilentlyContinue') {
                 [array]$deploymentTargets = (Get-AzResourceGroupDeploymentOperation -DeploymentName $name -ResourceGroupName $resourceGroupName).TargetResource | Where-Object { $_ -ne $null }
                 foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                    Write-Verbose ('Found deployment [{0}]' -f $deployment) -Verbose
                     [array]$resultSet += $deployment
                 }
                 foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
@@ -187,6 +188,7 @@ function Get-ResourceIdsOfDeployment {
     if (-not $deployments) {
         throw "No deployment found for [$name]"
     }
+    Write-Verbose ('Number of total deployments [{0}]' -f $deployments.Count) -Verbose
 
     return $deployments
 }

From f2ee4bd707c2c8962f3f6e2f39d613bed2d82306 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Mon, 20 Dec 2021 15:20:27 +0100
Subject: [PATCH 04/10] removal prints all

---
 .../resourceRemoval/helper/Remove-Deployment.ps1       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
index acfc62fb21..e7e57093e2 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
@@ -86,24 +86,24 @@ function Remove-Deployment {
             ResourceGroupName = $resourceGroupName
         }
         $deploymentResourceIds = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
-
+        Write-Verbose ('Remove-Deployment: Number of total deployments 1 [{0}]' -f $deploymentResourceIds.Count) -Verbose
         # Pre-Filter & order items
         # ========================
         $rawResourceIdsToRemove = $deploymentResourceIds | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
-
+        Write-Verbose ('Remove-Deployment: Number of total deployments 2 [{0}]' -f $rawResourceIdsToRemove.Count) -Verbose
         # Format items
         # ============
         $resourcesToRemove = Get-ResourceIdsAsFormattedObjectList -ResourceIds $rawResourceIdsToRemove
-
+        Write-Verbose ('Remove-Deployment: Number of total deployments 3 [{0}]' -f $resourcesToRemove.Count) -Verbose
         # Filter all dependency resources
         # ===============================
         $dependencyResourceNames = Get-DependencyResourceNameList
         $resourcesToRemove = $resourcesToRemove | Where-Object { (Split-Path $_.resourceId -Leaf) -notin $dependencyResourceNames }
-
+        Write-Verbose ('Remove-Deployment: Number of total deployments 4 [{0}]' -f $resourcesToRemove.Count) -Verbose
         # Order resources
         # ===============
         $resourcesToRemove = Get-OrderedResourcesList -ResourcesToOrder $resourcesToRemove -Order $RemovalSequence
-
+        Write-Verbose ('Remove-Deployment: Number of total deployments 5 [{0}]' -f $resourcesToRemove.Count) -Verbose
         # Remove resources
         # ================
         if ($resourcesToRemove.Count -gt 0) {

From f2f989004446367170bd25da0f2481f24fd1d487 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Mon, 20 Dec 2021 16:43:01 +0100
Subject: [PATCH 05/10] change privatedns vnet link default name

---
 .../virtualNetworkLinks/deploy.bicep              |  2 +-
 .../helper/Get-ResourceIdsOfDeployment.ps1        |  4 +++-
 .../resourceRemoval/helper/Remove-Deployment.ps1  | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
index b9e2308bdf..4efb0568f6 100644
--- a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
+++ b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
@@ -2,7 +2,7 @@
 param privateDnsZoneName string
 
 @description('Optional. The name of the virtual network link.')
-param name string = last(split(virtualNetworkResourceId, '/'))
+param name string = '${last(split(virtualNetworkResourceId, '/'))}-vnetlink'
 
 @description('Optional. The location of the PrivateDNSZone. Should be global.')
 param location string = 'global'
diff --git a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
index 356dc1d513..cdb7dd31bd 100644
--- a/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Get-ResourceIdsOfDeployment.ps1
@@ -69,6 +69,7 @@ function Get-ResourceIdsOfDeploymentInner {
         'subscription' {
             [array]$deploymentTargets = (Get-AzDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
             foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                Write-Verbose ('Found deployment [{0}]' -f $deployment) -Verbose
                 [array]$resultSet += $deployment
             }
             foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
@@ -87,6 +88,7 @@ function Get-ResourceIdsOfDeploymentInner {
         'managementgroup' {
             [array]$deploymentTargets = (Get-AzManagementGroupDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
             foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                Write-Verbose ('Found deployment [{0}]' -f $deployment) -Verbose
                 [array]$resultSet += $deployment
             }
             foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
@@ -103,6 +105,7 @@ function Get-ResourceIdsOfDeploymentInner {
         'tenant' {
             [array]$deploymentTargets = (Get-AzTenantDeploymentOperation -DeploymentName $name).TargetResource | Where-Object { $_ -ne $null }
             foreach ($deployment in ($deploymentTargets | Where-Object { $_ -notmatch '/deployments/' } )) {
+                Write-Verbose ('Found deployment [{0}]' -f $deployment) -Verbose
                 [array]$resultSet += $deployment
             }
             foreach ($deployment in ($deploymentTargets | Where-Object { $_ -match '/deployments/' } )) {
@@ -188,7 +191,6 @@ function Get-ResourceIdsOfDeployment {
     if (-not $deployments) {
         throw "No deployment found for [$name]"
     }
-    Write-Verbose ('Number of total deployments [{0}]' -f $deployments.Count) -Verbose
 
     return $deployments
 }
diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
index e7e57093e2..3526d3bde6 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
@@ -86,24 +86,29 @@ function Remove-Deployment {
             ResourceGroupName = $resourceGroupName
         }
         $deploymentResourceIds = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
-        Write-Verbose ('Remove-Deployment: Number of total deployments 1 [{0}]' -f $deploymentResourceIds.Count) -Verbose
+        Write-Verbose ('Remove-Deployment: Total number of deployments after fetching deployments [{0}]' -f $deploymentResourceIds.Count) -Verbose
+
         # Pre-Filter & order items
         # ========================
         $rawResourceIdsToRemove = $deploymentResourceIds | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
-        Write-Verbose ('Remove-Deployment: Number of total deployments 2 [{0}]' -f $rawResourceIdsToRemove.Count) -Verbose
+        Write-Verbose ('Remove-Deployment: Total number of deployments after pre-filtering & ordering items [{0}]' -f $rawResourceIdsToRemove.Count) -Verbose
+
         # Format items
         # ============
         $resourcesToRemove = Get-ResourceIdsAsFormattedObjectList -ResourceIds $rawResourceIdsToRemove
-        Write-Verbose ('Remove-Deployment: Number of total deployments 3 [{0}]' -f $resourcesToRemove.Count) -Verbose
+        Write-Verbose ('Remove-Deployment: Total number of deployments after formatting items [{0}]' -f $resourcesToRemove.Count) -Verbose
+
         # Filter all dependency resources
         # ===============================
         $dependencyResourceNames = Get-DependencyResourceNameList
         $resourcesToRemove = $resourcesToRemove | Where-Object { (Split-Path $_.resourceId -Leaf) -notin $dependencyResourceNames }
-        Write-Verbose ('Remove-Deployment: Number of total deployments 4 [{0}]' -f $resourcesToRemove.Count) -Verbose
+        Write-Verbose ('Remove-Deployment: Total number of deployments after filtering all dependency resources [{0}]' -f $resourcesToRemove.Count) -Verbose
+
         # Order resources
         # ===============
         $resourcesToRemove = Get-OrderedResourcesList -ResourcesToOrder $resourcesToRemove -Order $RemovalSequence
-        Write-Verbose ('Remove-Deployment: Number of total deployments 5 [{0}]' -f $resourcesToRemove.Count) -Verbose
+        Write-Verbose ('Remove-Deployment: Total number of deployments after final ordering of resources [{0}]' -f $resourcesToRemove.Count) -Verbose
+
         # Remove resources
         # ================
         if ($resourcesToRemove.Count -gt 0) {

From 81a873af11f65f1ddb750037a81c09ab18c61d28 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Mon, 20 Dec 2021 16:51:03 +0100
Subject: [PATCH 06/10] update api

---
 arm/Microsoft.Network/privateDnsZones/deploy.bicep        | 2 +-
 arm/Microsoft.Network/privateDnsZones/readme.md           | 8 ++++----
 .../privateDnsZones/virtualNetworkLinks/deploy.bicep      | 4 ++--
 .../privateDnsZones/virtualNetworkLinks/readme.md         | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arm/Microsoft.Network/privateDnsZones/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/deploy.bicep
index 55c377fe4c..7fe74e018e 100644
--- a/arm/Microsoft.Network/privateDnsZones/deploy.bicep
+++ b/arm/Microsoft.Network/privateDnsZones/deploy.bicep
@@ -29,7 +29,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource privateDnsZone 'Microsoft.Network/privateDnsZones@2018-09-01' = {
+resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
   name: name
   location: location
   tags: tags
diff --git a/arm/Microsoft.Network/privateDnsZones/readme.md b/arm/Microsoft.Network/privateDnsZones/readme.md
index 329335a7a9..e61a41134b 100644
--- a/arm/Microsoft.Network/privateDnsZones/readme.md
+++ b/arm/Microsoft.Network/privateDnsZones/readme.md
@@ -8,8 +8,8 @@ This template deploys a private DNS zone.
 | :-- | :-- |
 | `Microsoft.Authorization/locks` | 2016-09-01 |
 | `Microsoft.Authorization/roleAssignments` | 2020-04-01-preview |
-| `Microsoft.Network/privateDnsZones` | 2018-09-01 |
-| `Microsoft.Network/privateDnsZones/virtualNetworkLinks` | 2018-09-01 |
+| `Microsoft.Network/privateDnsZones` | 2020-06-01 |
+| `Microsoft.Network/privateDnsZones/virtualNetworkLinks` | 2020-06-01 |
 
 ## Parameters
 
@@ -73,6 +73,6 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 ## Template references
 
 - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2016-09-01/locks)
+- [Privatednszones](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2020-06-01/privateDnsZones)
+- [Privatednszones/Virtualnetworklinks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2020-06-01/privateDnsZones/virtualNetworkLinks)
 - [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2020-04-01-preview/roleAssignments)
-- [Privatednszones](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2018-09-01/privateDnsZones)
-- [Privatednszones/Virtualnetworklinks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2018-09-01/privateDnsZones/virtualNetworkLinks)
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
index 4efb0568f6..aeac283431 100644
--- a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
+++ b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep
@@ -24,11 +24,11 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-resource privateDnsZone 'Microsoft.Network/privateDnsZones@2018-09-01' existing = {
+resource privateDnsZone 'Microsoft.Network/privateDnsZones@2020-06-01' existing = {
   name: privateDnsZoneName
 }
 
-resource virtualNetworkLink 'Microsoft.Network/privateDnsZones/virtualNetworkLinks@2018-09-01' = {
+resource virtualNetworkLink 'Microsoft.Network/privateDnsZones/virtualNetworkLinks@2020-06-01' = {
   name: name
   parent: privateDnsZone
   location: location
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md
index 996e453678..51e29f2320 100644
--- a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md
+++ b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md
@@ -6,7 +6,7 @@ This module deploys private dns zone virtual network links.
 
 | Resource Type | API Version |
 | :-- | :-- |
-| `Microsoft.Network/privateDnsZones/virtualNetworkLinks` | 2018-09-01 |
+| `Microsoft.Network/privateDnsZones/virtualNetworkLinks` | 2020-06-01 |
 
 ## Parameters
 
@@ -14,7 +14,7 @@ This module deploys private dns zone virtual network links.
 | :-- | :-- | :-- | :-- | :-- |
 | `cuaId` | string |  |  | Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered |
 | `location` | string | `global` |  | Optional. The location of the PrivateDNSZone. Should be global. |
-| `name` | string | `[last(split(parameters('virtualNetworkResourceId'), '/'))]` |  | Optional. The name of the virtual network link. |
+| `name` | string | `[format('{0}-vnetlink', last(split(parameters('virtualNetworkResourceId'), '/')))]` |  | Optional. The name of the virtual network link. |
 | `privateDnsZoneName` | string |  |  | Required. Private DNS zone name. |
 | `registrationEnabled` | bool |  |  | Optional. Is auto-registration of virtual machine records in the virtual network in the Private DNS zone enabled? |
 | `tags` | object | `{object}` |  | Optional. Tags of the resource. |
@@ -47,4 +47,4 @@ Tag names and tag values can be provided as needed. A tag can be left without a
 
 ## Template references
 
-- [Privatednszones/Virtualnetworklinks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2018-09-01/privateDnsZones/virtualNetworkLinks)
+- [Privatednszones/Virtualnetworklinks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2020-06-01/privateDnsZones/virtualNetworkLinks)

From 5e804d8d395eb8a901e173a086dee94250c3e995 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Mon, 20 Dec 2021 16:54:55 +0100
Subject: [PATCH 07/10] update vnetlink default value

---
 .../privateDnsZones/.parameters/parameters.json                 | 2 +-
 arm/Microsoft.Network/privateDnsZones/deploy.bicep              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arm/Microsoft.Network/privateDnsZones/.parameters/parameters.json b/arm/Microsoft.Network/privateDnsZones/.parameters/parameters.json
index 4e7dc38d39..0cc56ed83e 100644
--- a/arm/Microsoft.Network/privateDnsZones/.parameters/parameters.json
+++ b/arm/Microsoft.Network/privateDnsZones/.parameters/parameters.json
@@ -3,7 +3,7 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "value": "sxx.az-privdns-x-001"
+            "value": "sxx-az-privdns-x-001.com"
         },
         "roleAssignments": {
             "value": [
diff --git a/arm/Microsoft.Network/privateDnsZones/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/deploy.bicep
index 7fe74e018e..02d65d7ce1 100644
--- a/arm/Microsoft.Network/privateDnsZones/deploy.bicep
+++ b/arm/Microsoft.Network/privateDnsZones/deploy.bicep
@@ -39,7 +39,7 @@ module privateDnsZone_virtualNetworkLinks 'virtualNetworkLinks/deploy.bicep' = [
   name: '${uniqueString(deployment().name, location)}-PrivateDnsZone-VirtualNetworkLink-${index}'
   params: {
     privateDnsZoneName: privateDnsZone.name
-    name: contains(virtualNetworkLinks, 'name') ? virtualNetworkLinks.name : last(split(virtualNetworkLinks.virtualNetworkResourceId, '/'))
+    name: contains(virtualNetworkLinks, 'name') ? virtualNetworkLinks.name : '${last(split(virtualNetworkLinks.virtualNetworkResourceId, '/'))}-vnetlink'
     virtualNetworkResourceId: virtualNetworkLinks.virtualNetworkResourceId
     location: contains(virtualNetworkLinks, 'location') ? virtualNetworkLinks.location : 'global'
     registrationEnabled: contains(virtualNetworkLinks, 'registrationEnabled') ? virtualNetworkLinks.registrationEnabled : false

From 8ea19869ace17cb8c455a1edd3e5a71e6ff6fa2f Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Mon, 20 Dec 2021 17:08:44 +0100
Subject: [PATCH 08/10] testing without order

---
 .../Initialize-DeploymentRemoval.ps1               | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
index 5da5b7acda..a37e0ab7d6 100644
--- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
@@ -72,13 +72,13 @@ function Initialize-DeploymentRemoval {
                     )
                     break
                 }
-                'privateDnsZones' {
-                    $removalSequence += @(
-                        'Microsoft.Network/privateDnsZones/virtualNetworkLinks',
-                        'Microsoft.Network/privateDnsZones'
-                    )
-                    break
-                }
+                # 'privateDnsZones' {
+                #     $removalSequence += @(
+                #         'Microsoft.Network/privateDnsZones/virtualNetworkLinks',
+                #         'Microsoft.Network/privateDnsZones'
+                #     )
+                #     break
+                # }
             }
 
             # Invoke removal

From 0ac3d7b5fefcb8321fd8b0f83ef2bdc680aa1fe6 Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Mon, 20 Dec 2021 17:22:00 +0100
Subject: [PATCH 09/10] cleanup

---
 .../resourceRemoval/Initialize-DeploymentRemoval.ps1       | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1 b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
index a37e0ab7d6..bb4cc7166d 100644
--- a/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
+++ b/utilities/pipelines/resourceRemoval/Initialize-DeploymentRemoval.ps1
@@ -72,13 +72,6 @@ function Initialize-DeploymentRemoval {
                     )
                     break
                 }
-                # 'privateDnsZones' {
-                #     $removalSequence += @(
-                #         'Microsoft.Network/privateDnsZones/virtualNetworkLinks',
-                #         'Microsoft.Network/privateDnsZones'
-                #     )
-                #     break
-                # }
             }
 
             # Invoke removal

From 6b82c2ee13c87ebd6df52f05b40e28c314e0d69b Mon Sep 17 00:00:00 2001
From: Erika Gressi <erikag.microsoft.com>
Date: Mon, 20 Dec 2021 18:07:58 +0100
Subject: [PATCH 10/10] remove function prefix

---
 .../resourceRemoval/helper/Remove-Deployment.ps1       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1 b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
index 3526d3bde6..3137192c12 100644
--- a/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
+++ b/utilities/pipelines/resourceRemoval/helper/Remove-Deployment.ps1
@@ -86,28 +86,28 @@ function Remove-Deployment {
             ResourceGroupName = $resourceGroupName
         }
         $deploymentResourceIds = Get-ResourceIdsOfDeployment @deploymentsInputObject -Verbose
-        Write-Verbose ('Remove-Deployment: Total number of deployments after fetching deployments [{0}]' -f $deploymentResourceIds.Count) -Verbose
+        Write-Verbose ('Total number of deployments after fetching deployments [{0}]' -f $deploymentResourceIds.Count) -Verbose
 
         # Pre-Filter & order items
         # ========================
         $rawResourceIdsToRemove = $deploymentResourceIds | Sort-Object -Property { $_.Split('/').Count } -Descending | Select-Object -Unique
-        Write-Verbose ('Remove-Deployment: Total number of deployments after pre-filtering & ordering items [{0}]' -f $rawResourceIdsToRemove.Count) -Verbose
+        Write-Verbose ('Total number of deployments after pre-filtering & ordering items [{0}]' -f $rawResourceIdsToRemove.Count) -Verbose
 
         # Format items
         # ============
         $resourcesToRemove = Get-ResourceIdsAsFormattedObjectList -ResourceIds $rawResourceIdsToRemove
-        Write-Verbose ('Remove-Deployment: Total number of deployments after formatting items [{0}]' -f $resourcesToRemove.Count) -Verbose
+        Write-Verbose ('Total number of deployments after formatting items [{0}]' -f $resourcesToRemove.Count) -Verbose
 
         # Filter all dependency resources
         # ===============================
         $dependencyResourceNames = Get-DependencyResourceNameList
         $resourcesToRemove = $resourcesToRemove | Where-Object { (Split-Path $_.resourceId -Leaf) -notin $dependencyResourceNames }
-        Write-Verbose ('Remove-Deployment: Total number of deployments after filtering all dependency resources [{0}]' -f $resourcesToRemove.Count) -Verbose
+        Write-Verbose ('Total number of deployments after filtering all dependency resources [{0}]' -f $resourcesToRemove.Count) -Verbose
 
         # Order resources
         # ===============
         $resourcesToRemove = Get-OrderedResourcesList -ResourcesToOrder $resourcesToRemove -Order $RemovalSequence
-        Write-Verbose ('Remove-Deployment: Total number of deployments after final ordering of resources [{0}]' -f $resourcesToRemove.Count) -Verbose
+        Write-Verbose ('Total number of deployments after final ordering of resources [{0}]' -f $resourcesToRemove.Count) -Verbose
 
         # Remove resources
         # ================