From 11f17409d5750b0e9cedbcb151664dc7f373f125 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Tue, 16 Nov 2021 23:21:11 +0100
Subject: [PATCH 001/121] Change

---
 utilities/publishing/Publishing.ps1 | 74 +++++++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 utilities/publishing/Publishing.ps1

diff --git a/utilities/publishing/Publishing.ps1 b/utilities/publishing/Publishing.ps1
new file mode 100644
index 0000000000..df3d3b860b
--- /dev/null
+++ b/utilities/publishing/Publishing.ps1
@@ -0,0 +1,74 @@
+function Get-ChangedFiles {
+    $Diff = git diff --name-only HEAD^ HEAD
+    $ChangedFiles = $Diff | Get-Item
+    return $ChangedFiles
+}
+
+function Get-ChangedModuleFiles {
+    $ChangedModuleFiles = Get-ChangedFiles | Where-Object { $_.Name -eq 'deploy.bicep' }
+    return $ChangedModuleFiles
+}
+
+function Get-ModuleName {
+    [CmdletBinding()]
+    param (
+        [Parameter(ValueFromPipeline)]
+        [string]
+        $Path
+    )
+    $FolderName = $Path.Replace('deploy.bicep', '')
+    $FolderName = $FolderName.Trim('\')
+    $ModuleName = $FolderName.Split('\arm\')[-1].Replace('\', '_')
+    return $ModuleName
+}
+
+function Get-ModuleVersion {
+    [CmdletBinding()]
+    param (
+        [Parameter(ValueFromPipeline)]
+        [string]
+        $Path
+    )
+    $FolderName = $Path.Replace('deploy.bicep', '')
+    $FolderName = $FolderName.Trim('\')
+    $VersionFilePath = Join-Path $FolderName 'version.json'
+    if (-not (Test-Path -Path $VersionFilePath)) {
+        Write-Host "No version file found at: $VersionFilePath"
+        return
+    }
+    $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
+    $Version = $VersionFileContent.version
+    return $Version
+}
+
+function Get-ParentModule {
+    param (
+        [Parameter(ValueFromPipeline)]
+        [string]
+        $Path
+    )
+
+    $File = Get-Item -Path $Path
+    $File
+    $ParentDeployFilePath = Join-Path $File.Directory.Parent.FullName 'deploy.bicep'
+    if (-not (Test-Path -Path $ParentDeployFilePath)) {
+        Write-Verbose "No parent deploy file found at: $ParentDeployFilePath"
+        return
+    }
+    $ParentModules = @($ParentDeployFilePath)
+    $ParentModules += (Get-ParentModule -Path $ParentDeployFilePath)
+    return $ParentModules
+}
+
+# Read version file
+Get-ChangedModuleFiles | ForEach-Object {
+    $ModuleName = $_.FullName | Get-ModuleName
+    $ModuleVersion = $_.FullName | Get-ModuleVersion
+
+    Write-Output "Version file found for module: $ModuleName - $ModuleVersion"
+    $ParentModules = $_.FullName | Get-ParentModule
+    # Find parents | Update parents
+    # Construct name of readme file to publish
+    # Publish module | readme file
+}
+

From c8e7090a7c5fd87ebd0ef2eb0aba457c613a517b Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 17 Nov 2021 07:38:37 +0100
Subject: [PATCH 002/121] Added params on Get-ChangedFiles

---
 utilities/publishing/Publishing.ps1 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/utilities/publishing/Publishing.ps1 b/utilities/publishing/Publishing.ps1
index df3d3b860b..80fd3a7a32 100644
--- a/utilities/publishing/Publishing.ps1
+++ b/utilities/publishing/Publishing.ps1
@@ -1,10 +1,19 @@
 function Get-ChangedFiles {
-    $Diff = git diff --name-only HEAD^ HEAD
+    [CmdletBinding()]
+    param (
+        [Parameter(Position = 0)]
+        [string] $Commit = 'HEAD^',
+
+        [Parameter(Position = 1)]
+        [string] $CompareCommit = 'HEAD'
+    )
+    $Diff = git diff --name-only $Commit $CompareCommit
     $ChangedFiles = $Diff | Get-Item
     return $ChangedFiles
 }
 
 function Get-ChangedModuleFiles {
+    [CmdletBinding()]
     $ChangedModuleFiles = Get-ChangedFiles | Where-Object { $_.Name -eq 'deploy.bicep' }
     return $ChangedModuleFiles
 }

From aad3ee60061b2c19da7e6083ab309e7d13d1f2fb Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 17 Nov 2021 14:08:45 +0100
Subject: [PATCH 003/121] Blank line

---
 .../storageAccounts/tableServices/tables/deploy.bicep            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
index d2bbbd3320..5aa648aae9 100644
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
@@ -13,6 +13,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
+
 resource table 'Microsoft.Storage/storageAccounts/tableServices/tables@2021-06-01' = {
   name: '${storageAccountName}/default/${name}'
 }

From a73247db05176179db1e9e4fcae1cd3a424bbe9f Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 18 Nov 2021 17:30:54 +0100
Subject: [PATCH 004/121] TL;DR - Many changes

---
 .../templates/publishModule/action.yml        |  6 +--
 .../workflows/ms.storage.storageaccounts.yml  | 34 +++++++++---
 .vscode/settings.json                         |  6 ++-
 .../tableServices/metadata.json               |  9 ++++
 .../tableServices/tables/version.json         |  7 +++
 .../tableServices/version.json                |  7 +++
 utilities/publishing/Publishing.ps1           | 52 +++++++++++++------
 7 files changed, 92 insertions(+), 29 deletions(-)
 create mode 100644 arm/Microsoft.Storage/storageAccounts/tableServices/metadata.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/tableServices/version.json

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 21344f1398..516247dae8 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -40,7 +40,7 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    - name: 'Setup agent & login'
+    - name: 'Setup agent'
       shell: pwsh
       run: |
         # Load used functions
@@ -70,8 +70,6 @@ runs:
             templateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
             templateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
             templateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
-            customVersion            = '${{ inputs.customVersion }}'
-            versioningOption         = '${{ inputs.versioningOption }}'
           }
 
           Write-Verbose "Invoke task with" -Verbose
@@ -97,8 +95,6 @@ runs:
             templateFilePath    = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
             bicepRegistryName   = '${{ inputs.bicepRegistryName }}'
             bicepRegistryRgName = '${{ inputs.bicepRegistryRgName }}'
-            customVersion       = '${{ inputs.customVersion }}'
-            versioningOption    = '${{ inputs.versioningOption }}'
           }
 
           Write-Verbose "Invoke task with" -Verbose
diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index 991e25ba0f..67efdac577 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -161,9 +161,9 @@ jobs:
   ###############
   #   PUBLISH   #
   ###############
-  job_publish_module:
-    name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+  job_publish_module_templateSpec:
+    name: 'Publish module - Template Spec'
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref, eq('${{ env.templateSpecsDoPublish }}', 'true'))
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -181,16 +181,34 @@ jobs:
       - name: 'Publish module'
         uses: ./.github/actions/templates/publishModule
         with:
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
-          templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
+
+
+  job_publish_module_bicep:
+    name: 'Publish module - Bicep'
+    if: and(contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref), eq('${{ env.bicepRegistryDoPublish }}', 'true'))
+    runs-on: ubuntu-20.04
+    needs:
+      - job_set_workflow_param
+      - job_deploy_module
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set environment variables
+        uses: deep-mm/set-variables@v1.0
+        with:
+          # Name of variable file
+          variableFileName: 'variables.module' # Don't write .json here
+      - name: 'Publish module'
+        uses: ./.github/actions/templates/publishModule
+        with:
           bicepRegistryName: '${{ env.bicepRegistryName }}'
           bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
-          bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
+
 
   ##############
   #   REMOVE   #
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8b56df2cb7..88b820abd5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -23,7 +23,11 @@
     "markdown.extension.orderedList.marker": "one",
     "markdown.extension.tableFormatter.enabled": false,
     "markdownlint.config": {
-        "MD034": true
+        "MD034": true,
+        "MD028": false,
+        "MD025": {
+            "front_matter_title": ""
+        }
     },
     "powershell.codeFormatting.autoCorrectAliases": true,
     "powershell.codeFormatting.newLineAfterCloseBrace": false,
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/metadata.json b/arm/Microsoft.Storage/storageAccounts/tableServices/metadata.json
new file mode 100644
index 0000000000..242c68e64c
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/metadata.json
@@ -0,0 +1,9 @@
+{
+    "$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#",
+    "type": "Module",
+    "itemDisplayName": "This module deploys a storage account table service",
+    "description": "This module deploys a storage account table service",
+    "summary": "This module deploys a storage account table service using apiVersion 2021-04-01.",
+    "githubUsername": "commitOwner",
+    "dateUpdated": "2021-11-17"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
new file mode 100644
index 0000000000..115ed689f8
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
@@ -0,0 +1,7 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4",
+    "cloudBuild": {
+        "setVersionVariables": false
+    }
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/version.json b/arm/Microsoft.Storage/storageAccounts/tableServices/version.json
new file mode 100644
index 0000000000..115ed689f8
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/version.json
@@ -0,0 +1,7 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.4",
+    "cloudBuild": {
+        "setVersionVariables": false
+    }
+}
diff --git a/utilities/publishing/Publishing.ps1 b/utilities/publishing/Publishing.ps1
index 80fd3a7a32..71ce752eb3 100644
--- a/utilities/publishing/Publishing.ps1
+++ b/utilities/publishing/Publishing.ps1
@@ -25,9 +25,8 @@ function Get-ModuleName {
         [string]
         $Path
     )
-    $FolderName = $Path.Replace('deploy.bicep', '')
-    $FolderName = $FolderName.Trim('\')
-    $ModuleName = $FolderName.Split('\arm\')[-1].Replace('\', '_')
+    $FolderPath = Split-Path -Path $Path -Parent
+    $ModuleName = $FolderPath.Replace('/','\').Split('\arm\')[-1].Replace('\', '.').ToLower()
     return $ModuleName
 }
 
@@ -38,12 +37,10 @@ function Get-ModuleVersion {
         [string]
         $Path
     )
-    $FolderName = $Path.Replace('deploy.bicep', '')
-    $FolderName = $FolderName.Trim('\')
-    $VersionFilePath = Join-Path $FolderName 'version.json'
+    $FolderPath = Split-Path -Path $Path -Parent
+    $VersionFilePath = Join-Path $FolderPath 'version.json'
     if (-not (Test-Path -Path $VersionFilePath)) {
-        Write-Host "No version file found at: $VersionFilePath"
-        return
+        throw "No version file found at: $VersionFilePath"
     }
     $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
     $Version = $VersionFileContent.version
@@ -54,21 +51,45 @@ function Get-ParentModule {
     param (
         [Parameter(ValueFromPipeline)]
         [string]
-        $Path
+        $Path,
+
+        [Parameter()]
+        [switch] $Recurse
+
     )
 
     $File = Get-Item -Path $Path
-    $File
     $ParentDeployFilePath = Join-Path $File.Directory.Parent.FullName 'deploy.bicep'
     if (-not (Test-Path -Path $ParentDeployFilePath)) {
         Write-Verbose "No parent deploy file found at: $ParentDeployFilePath"
         return
     }
     $ParentModules = @($ParentDeployFilePath)
-    $ParentModules += (Get-ParentModule -Path $ParentDeployFilePath)
+    if ($Recurse) {
+        $ParentModules += Get-ParentModule $ParentDeployFilePath -Recurse
+    }
     return $ParentModules
 }
 
+function Update-ChangedModule {
+    [CmdletBinding(SupportsShouldProcess)]
+    param (
+        [Parameter(ValueFromPipelineByPropertyName)]
+        [string] $Path = 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep',
+    )
+
+    $ModulePath = $Path
+    $ModuleName = Get-ModuleName -Path $ModulePath
+    $ModuleVersion = Get-ModuleVersion -Path $ModulePath -ErrorAction Stop
+    $SourceReadMeFileName = Get-ModuleReadme -Path $ModulePath
+    $DestinationReadmeFileName = "$ModuleName-$ModuleVersion.md"
+    if ($PSCmdlet.ShouldProcess("$ReadmeFileName", 'Copy')) {
+        $ReadmeFileName # Export/Copy it?
+    }
+    $ParentModules = Get-ParentModule $ModulePath
+    Update-ChangedModule $ParentModules
+}
+
 # Read version file
 Get-ChangedModuleFiles | ForEach-Object {
     $ModuleName = $_.FullName | Get-ModuleName
@@ -76,8 +97,9 @@ Get-ChangedModuleFiles | ForEach-Object {
 
     Write-Output "Version file found for module: $ModuleName - $ModuleVersion"
     $ParentModules = $_.FullName | Get-ParentModule
-    # Find parents | Update parents
-    # Construct name of readme file to publish
-    # Publish module | readme file
-}
+    Update-ChangedModule $ParentModules
+
+    # Publish module and/or readme file
 
+    # Gather info on modules to publish
+}

From dec8f7ee5f7aba6fde912a7517daede7ea7dae11 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 2 Dec 2021 10:56:28 +0100
Subject: [PATCH 005/121] update to publish

---
 utilities/publishing/Publishing.ps1 | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/utilities/publishing/Publishing.ps1 b/utilities/publishing/Publishing.ps1
index 71ce752eb3..a7a32546f7 100644
--- a/utilities/publishing/Publishing.ps1
+++ b/utilities/publishing/Publishing.ps1
@@ -7,7 +7,7 @@
         [Parameter(Position = 1)]
         [string] $CompareCommit = 'HEAD'
     )
-    $Diff = git diff --name-only $Commit $CompareCommit
+    $Diff = git diff --diff-filter=AM --name-only $Commit $CompareCommit
     $ChangedFiles = $Diff | Get-Item
     return $ChangedFiles
 }
@@ -71,11 +71,26 @@ function Get-ParentModule {
     return $ParentModules
 }
 
+function Get-GitDistance {
+    [CmdletBinding()]
+    param (
+        [Parameter(ValueFromPipeline)]
+        [string]
+        $Commit,
+
+        [Parameter(ValueFromPipeline)]
+        [string]
+        $CompareCommit
+    )
+    $Distance = (git rev-list $Commit ^$CompareCommit | wc -l) - 1
+    return $Distance
+}
+
 function Update-ChangedModule {
     [CmdletBinding(SupportsShouldProcess)]
     param (
         [Parameter(ValueFromPipelineByPropertyName)]
-        [string] $Path = 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep',
+        [string] $Path = 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
     )
 
     $ModulePath = $Path

From e9cdec68b766a890b03cd204864dfbedae1d3fab Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 2 Dec 2021 11:02:15 +0100
Subject: [PATCH 006/121] testing

---
 utilities/publishing/Publishing.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utilities/publishing/Publishing.ps1 b/utilities/publishing/Publishing.ps1
index a7a32546f7..2cc11abd42 100644
--- a/utilities/publishing/Publishing.ps1
+++ b/utilities/publishing/Publishing.ps1
@@ -7,7 +7,7 @@
         [Parameter(Position = 1)]
         [string] $CompareCommit = 'HEAD'
     )
-    $Diff = git diff --diff-filter=AM --name-only $Commit $CompareCommit
+    $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
     $ChangedFiles = $Diff | Get-Item
     return $ChangedFiles
 }
@@ -82,7 +82,7 @@ function Get-GitDistance {
         [string]
         $CompareCommit
     )
-    $Distance = (git rev-list $Commit ^$CompareCommit | wc -l) - 1
+    $Distance = (git rev-list $Commit ^$CompareCommit).count - 1
     return $Distance
 }
 

From 739354a75f4aacb063dfae563f99fefdc4e750d3 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 2 Dec 2021 12:01:26 +0100
Subject: [PATCH 007/121] Prepping for test

---
 .../templates/publishModule/action.yml        | 41 +++++++----
 .../Get-ChangedChildResources.ps1}            | 49 ++-----------
 .../Publish-ModuleToPrivateBicepRegistry.ps1  | 56 +++------------
 .../Publish-ModuleToTemplateSpec.ps1          | 70 ++-----------------
 .../resourcePublish/Set-ModuleVersion.ps1     | 44 ++++++++++++
 5 files changed, 90 insertions(+), 170 deletions(-)
 rename utilities/{publishing/Publishing.ps1 => pipelines/resourcePublish/Get-ChangedChildResources.ps1} (58%)
 create mode 100644 utilities/pipelines/resourcePublish/Set-ModuleVersion.ps1

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 7c6a9e243b..41f3019cb8 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -5,14 +5,6 @@ inputs:
   templateFilePath:
     description: 'The path to the template file to publish'
     required: true
-  versioningOption:
-    description: 'The mode to handle the version increments [major|minor|patch].'
-    default: 'patch'
-    required: false
-  customVersion:
-    description: 'Custom version to apply. Used only if higher than latest'
-    default: '0.0.1'
-    required: false
   templateSpecsRgName:
     description: 'Required to publish to template spec. ResourceGroup of the template spec to publish to'
     required: false
@@ -22,7 +14,7 @@ inputs:
   templateSpecsDescription:
     description: 'Required to publish to template spec. Description of the template spec to publish to'
     required: false
-  templateSpecsDoPublish:
+  publishToTemplateSpecs:
     description: 'Flag to indicate whether or not to publish to template specs'
     default: 'false'
     required: false
@@ -32,7 +24,7 @@ inputs:
   bicepRegistryRgName:
     description: 'Required to publish to private bicep registry. Location of the container registry resource group'
     required: false
-  bicepRegistryDoPublish:
+  publishToBicepRegistry:
     description: 'Flag to indicate whether or not to publish to the private bicep registry'
     default: 'false'
     required: false
@@ -55,13 +47,32 @@ runs:
         creds: ${{ env.AZURE_CREDENTIALS }}
         enable-AzPSSession: true
 
+    - name: 'Generate version number'
+      id: 'versionNumber'
+      shell: pwsh
+      run: |
+        # Load used functions
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Set-VersionNumber.ps1')
+
+        $functionInput = @{
+          ModuleFilePath         = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
+        }
+
+        Write-Verbose "Invoke task with" -Verbose
+        Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+
+        $ModuleVersion = Get-ModuleVersion @functionInput -Verbose
+
+        Write-Output "Module version is: $ModuleVersion"
+        Write-Output "::set-output name=versionNumber::$ModuleVersion"
+
     - name: 'Publish module to template specs'
       shell: pwsh
-      # if: ${{ inputs.templateSpecsDoPublish == 'true' }}
+      # if: ${{ inputs.publishToTemplateSpecs == 'true' }}
       run: |
         # Workaround until composite actions support conditions
         # Once available, remove this if and enable the step condition
-        if('${{ inputs.templateSpecsDoPublish }}' -eq 'true') {
+        if('${{ inputs.publishToTemplateSpecs }}' -eq 'true') {
 
           # Load used functions
           . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
@@ -71,6 +82,7 @@ runs:
             templateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
             templateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
             templateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
+            ModuleVersion            = '${{ steps.versionNumber.outputs.versionNumber }}'
           }
 
           Write-Verbose "Invoke task with" -Verbose
@@ -83,11 +95,11 @@ runs:
 
     - name: 'Publish module to private bicep registry'
       shell: pwsh
-      # if: ${{ inputs.bicepRegistryDoPublish == 'true' }}
+      # if: ${{ inputs.publishToBicepRegistry == 'true' }}
       run: |
         # Workaround until composite actions support conditions
         # Once available, remove this if and enable the step condition
-        if('${{ inputs.bicepRegistryDoPublish }}' -eq 'true') {
+        if('${{ inputs.publishToBicepRegistry }}' -eq 'true') {
 
           # Load used functions
           . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
@@ -96,6 +108,7 @@ runs:
             templateFilePath    = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
             bicepRegistryName   = '${{ inputs.bicepRegistryName }}'
             bicepRegistryRgName = '${{ inputs.bicepRegistryRgName }}'
+            ModuleVersion       = '${{ steps.versionNumber.outputs.versionNumber }}'
           }
 
           Write-Verbose "Invoke task with" -Verbose
diff --git a/utilities/publishing/Publishing.ps1 b/utilities/pipelines/resourcePublish/Get-ChangedChildResources.ps1
similarity index 58%
rename from utilities/publishing/Publishing.ps1
rename to utilities/pipelines/resourcePublish/Get-ChangedChildResources.ps1
index 2cc11abd42..c78124be36 100644
--- a/utilities/publishing/Publishing.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ChangedChildResources.ps1
@@ -30,23 +30,6 @@ function Get-ModuleName {
     return $ModuleName
 }
 
-function Get-ModuleVersion {
-    [CmdletBinding()]
-    param (
-        [Parameter(ValueFromPipeline)]
-        [string]
-        $Path
-    )
-    $FolderPath = Split-Path -Path $Path -Parent
-    $VersionFilePath = Join-Path $FolderPath 'version.json'
-    if (-not (Test-Path -Path $VersionFilePath)) {
-        throw "No version file found at: $VersionFilePath"
-    }
-    $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
-    $Version = $VersionFileContent.version
-    return $Version
-}
-
 function Get-ParentModule {
     param (
         [Parameter(ValueFromPipeline)]
@@ -71,36 +54,16 @@ function Get-ParentModule {
     return $ParentModules
 }
 
-function Get-GitDistance {
-    [CmdletBinding()]
-    param (
-        [Parameter(ValueFromPipeline)]
-        [string]
-        $Commit,
-
-        [Parameter(ValueFromPipeline)]
-        [string]
-        $CompareCommit
-    )
-    $Distance = (git rev-list $Commit ^$CompareCommit).count - 1
-    return $Distance
-}
-
 function Update-ChangedModule {
-    [CmdletBinding(SupportsShouldProcess)]
+    [CmdletBinding()]
     param (
         [Parameter(ValueFromPipelineByPropertyName)]
-        [string] $Path = 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+        [string] $ModulePath = 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
     )
 
     $ModulePath = $Path
     $ModuleName = Get-ModuleName -Path $ModulePath
-    $ModuleVersion = Get-ModuleVersion -Path $ModulePath -ErrorAction Stop
-    $SourceReadMeFileName = Get-ModuleReadme -Path $ModulePath
-    $DestinationReadmeFileName = "$ModuleName-$ModuleVersion.md"
-    if ($PSCmdlet.ShouldProcess("$ReadmeFileName", 'Copy')) {
-        $ReadmeFileName # Export/Copy it?
-    }
+
     $ParentModules = Get-ParentModule $ModulePath
     Update-ChangedModule $ParentModules
 }
@@ -110,11 +73,7 @@ Get-ChangedModuleFiles | ForEach-Object {
     $ModuleName = $_.FullName | Get-ModuleName
     $ModuleVersion = $_.FullName | Get-ModuleVersion
 
-    Write-Output "Version file found for module: $ModuleName - $ModuleVersion"
+    Write-Output "Update: $ModuleName - $ModuleVersion"
     $ParentModules = $_.FullName | Get-ParentModule
     Update-ChangedModule $ParentModules
-
-    # Publish module and/or readme file
-
-    # Gather info on modules to publish
 }
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index c0901576fd..9bbc0e8beb 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -4,8 +4,8 @@ Publish a new version of a given module to a private bicep registry
 
 .DESCRIPTION
 Publish a new version of a given module to a private bicep registry
-The function will take evaluate which version should be published based on the provided input parameters (customVersion, versioningOption) and the version currently deployed to the private bicep registry
-If the customVersion is higher than the current latest, it has the highest priority over the other options
+The function will take evaluate which version should be published based on the provided input parameters (moduleVersion, ) and the version currently deployed to the private bicep registry
+If the moduleVersion is higher than the current latest, it has the highest priority over the other options
 Otherwise, one of the provided version options is chosen and applied with the default being 'patch'
 
 .PARAMETER templateFilePath
@@ -17,14 +17,11 @@ Mandatory. Name of the private bicep registry to publish to.
 .PARAMETER bicepRegistryRgName
 Mandatory. ResourceGroup of the private bicep registry to publish to.
 
-.PARAMETER customVersion
+.PARAMETER moduleVersion
 Optional. A custom version that can be provided by the UI. '-' represents an empty value.
 
-.PARAMETER versioningOption
-Optional. A version option that can be specified in the UI. Defaults to 'patch'
-
 .EXAMPLE
-Publish-ModuleToPrivateBicepRegistry -templateFilePath 'C:/KeyVault/deploy.json' -bicepRegistryRgName 'artifacts-rg' -customVersion '3.0.0'
+Publish-ModuleToPrivateBicepRegistry -templateFilePath 'C:/KeyVault/deploy.json' -bicepRegistryRgName 'artifacts-rg' -moduleVersion '3.0.0'
 
 Try to publish the KeyVault module with version 3.0.0 to a private bicep registry called KeyVault based on a value provided in the UI
 #>
@@ -41,12 +38,8 @@ function Publish-ModuleToPrivateBicepRegistry {
         [Parameter(Mandatory)]
         [string] $bicepRegistryName,
 
-        [Parameter(Mandatory = $false)]
-        [string] $customVersion = '0.0.1',
-
-        [Parameter(Mandatory = $false)]
-        [ValidateSet('Major', 'Minor', 'Patch')]
-        [string] $versioningOption = 'Patch'
+        [Parameter(Mandatory)]
+        [string] $ModuleVersion
     )
 
     begin {
@@ -89,41 +82,8 @@ function Publish-ModuleToPrivateBicepRegistry {
             $latestVersion = New-Object System.Version('0.0.0')
         }
 
-        ############################
-        ##    EVALUATE VERSION    ##
-        ############################
-
-        if (-not ([String]::IsNullOrEmpty($customVersion)) -and ((New-Object System.Version($customVersion)) -gt (New-Object System.Version($latestVersion)))) {
-            Write-Verbose "A custom version [$customVersion] was specified in the pipeline script and is higher than the current latest. Using it."
-            $newVersion = $customVersion
-        } else {
-            Write-Verbose 'No custom version set. Using default versioning.'
-
-            switch ($versioningOption) {
-                'major' {
-                    Write-Verbose 'Apply version update on "major" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList ($latestVersion.Major + 1), 0, 0).ToString()
-                    break
-                }
-                'minor' {
-                    Write-Verbose 'Apply version update on "minor" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList $latestVersion.Major, ($latestVersion.Minor + 1), 0).ToString()
-                    break
-                }
-                'patch' {
-                    Write-Verbose 'Apply version update on "patch" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList $latestVersion.Major, $latestVersion.Minor, ($latestVersion.Build + 1)).ToString()
-                    break
-                }
-                default {
-                    throw "Unsupported version option: $versioningOption."
-                }
-            }
-        }
-
-        $newVersionObject = New-Object System.Version($newVersion)
-        if ($newVersionObject -lt $latestVersion -or $newVersionObject -eq $latestVersion) {
-            throw ('The provided custom version [{0}] must be higher than the current latest version [{1}] published in the private bicep registry [{2}]' -f $newVersionObject.ToString(), $latestVersion.ToString(), $bicepRegistryName)
+        if($latestVersion -ge $ModuleVersion) {
+            throw "The version [$ModuleVersion] is not higher than the latest version [$latestVersion] in the private bicep registry [$bicepRegistryName]."
         }
 
         #############################################
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
index 19cfa37b7d..8d39aaddb3 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
@@ -4,7 +4,7 @@ Publish a new version of a given module to a template spec
 
 .DESCRIPTION
 Publish a new version of a given module to a template spec
-The function will take evaluate which version should be published based on the provided input parameters (customVersion, versioningOption) and the version currently deployed to the template spec
+The function will take evaluate which version should be published based on the provided input parameters (ModuleVersion, versioningOption) and the version currently deployed to the template spec
 If the customVersion is higher than the current latest, it has the highest priority over the other options
 Otherwise, one of the provided version options is chosen and applied with the default being 'patch'
 
@@ -22,11 +22,8 @@ Mandatory. Location of the template spec resource group.
 .PARAMETER templateSpecsDescription
 Mandatory. The description of the parent template spec.
 
-.PARAMETER customVersion
-Optional. A custom version that can be provided by the UI. '-' represents an empty value.
-
-.PARAMETER versioningOption
-Optional. A version option that can be specified in the UI. Defaults to 'patch'
+.PARAMETER ModuleVersion
+Optional. A custom/generated version for the module.
 
 .EXAMPLE
 Publish-ModuleToTemplateSpec -templateFilePath 'C:/KeyVault/deploy.json' -templateSpecsRgName 'artifacts-rg' -templateSpecsRgLocation 'West Europe' -templateSpecsDescription 'iacs key vault' -customVersion '3.0.0'
@@ -49,12 +46,8 @@ function Publish-ModuleToTemplateSpec {
         [Parameter(Mandatory)]
         [string] $templateSpecsDescription,
 
-        [Parameter(Mandatory = $false)]
-        [string] $customVersion = '0.0.1',
-
-        [Parameter(Mandatory = $false)]
-        [ValidateSet('Major', 'Minor', 'Patch')]
-        [string] $versioningOption = 'Patch'
+        [Parameter(Mandatory)]
+        [string] $ModuleVersion
     )
 
     begin {
@@ -74,63 +67,14 @@ function Publish-ModuleToTemplateSpec {
             }
         }
 
-        #################################
-        ##    FIND AVAILABLE VERSION   ##
-        #################################
-        if ($templateSpec = Get-AzTemplateSpec -ResourceGroupName $templateSpecsRgName -Name $templateSpecIdentifier -ErrorAction 'SilentlyContinue') {
-            $uniqueVersions = $templateSpec.Versions.Name | Get-Unique | Where-Object { $_ -like '*.*.*' } # remove Where-object for working example
-            $latestVersion = (($uniqueVersions -as [Version[]]) | Measure-Object -Maximum).Maximum
-            Write-Verbose "Published versions detected in template spec [$templateSpecIdentifier]. Fetched latest [$latestVersion]."
-        } else {
-            Write-Verbose "No version detected in template spec [$templateSpecIdentifier]. Creating new."
-            $latestVersion = New-Object System.Version('0.0.0')
-        }
-
-        ############################
-        ##    EVALUATE VERSION    ##
-        ############################
-
-        if (-not ([String]::IsNullOrEmpty($customVersion)) -and ((New-Object System.Version($customVersion)) -gt (New-Object System.Version($latestVersion)))) {
-            Write-Verbose "A custom version [$customVersion] was specified in the pipeline script and is higher than the current latest. Using it."
-            $newVersion = $customVersion
-        } else {
-            Write-Verbose 'No custom version set. Using default versioning.'
-
-            switch ($versioningOption) {
-                'major' {
-                    Write-Verbose 'Apply version update on "major" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList ($latestVersion.Major + 1), 0, 0).ToString()
-                    break
-                }
-                'minor' {
-                    Write-Verbose 'Apply version update on "minor" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList $latestVersion.Major, ($latestVersion.Minor + 1), 0).ToString()
-                    break
-                }
-                'patch' {
-                    Write-Verbose 'Apply version update on "patch" level'
-                    $newVersion = (New-Object -TypeName System.Version -ArgumentList $latestVersion.Major, $latestVersion.Minor, ($latestVersion.Build + 1)).ToString()
-                    break
-                }
-                default {
-                    throw "Unsupported version option: $versioningOption."
-                }
-            }
-        }
-
-        $newVersionObject = New-Object System.Version($newVersion)
-        if ($newVersionObject -lt $latestVersion -or $newVersionObject -eq $latestVersion) {
-            throw ('The provided custom version [{0}] must be higher than the current latest version [{1}] published in the template spec [{2}]' -f $newVersionObject.ToString(), $latestVersion.ToString(), $templateSpecIdentifier)
-        }
-
         ################################
         ##    Create template spec    ##
         ################################
-        if ($PSCmdlet.ShouldProcess("Template spec [$templateSpecIdentifier] version [$newVersion]", 'Publish')) {
+        if ($PSCmdlet.ShouldProcess("Template spec [$templateSpecIdentifier] version [$ModuleVersion]", 'Publish')) {
             $templateSpecInputObject = @{
                 ResourceGroupName = $templateSpecsRgName
                 Name              = $templateSpecIdentifier
-                Version           = $newVersion
+                Version           = $ModuleVersion
                 Description       = $templateSpecsDescription
                 Location          = $templateSpecsRgLocation
                 TemplateFile      = $templateFilePath
diff --git a/utilities/pipelines/resourcePublish/Set-ModuleVersion.ps1 b/utilities/pipelines/resourcePublish/Set-ModuleVersion.ps1
new file mode 100644
index 0000000000..74fb5d0552
--- /dev/null
+++ b/utilities/pipelines/resourcePublish/Set-ModuleVersion.ps1
@@ -0,0 +1,44 @@
+function Get-GitDistance {
+    [CmdletBinding()]
+    param (
+        [Parameter(Position = 0)]
+        [string] $Commit = 'HEAD^',
+
+        [Parameter(Position = 1)]
+        [string] $CompareCommit = 'HEAD'
+    )
+    $Distance = (git rev-list $Commit $CompareCommit).count - 1
+    return $Distance
+}
+
+function Get-ModuleVersion {
+    [CmdletBinding()]
+    param (
+        [Parameter(ValueFromPipeline)]
+        [string]
+        $ModuleFilePath
+    )
+    $ModuleFile = Get-Item -Path $ModuleFilePath
+    $ModuleFolder = Split-Path -Path $ModuleFile -Parent
+    $VersionFilePath = Join-Path $ModuleFolder 'version.json'
+
+    if (-not (Test-Path -Path $VersionFilePath)) {
+        throw "No version file found at: $VersionFilePath"
+    }
+
+    $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
+    $Version = $VersionFileContent.version
+
+    return $Version
+}
+
+function Set-ModuleVersion {
+        [CmdletBinding()]
+        param (
+            $ModuleFilePath
+        )
+        $Version = Get-ModuleVersion -ModuleFilePath $ModuleFilePath
+        $Patch = Get-GitDistance
+        $NewVersion = [System.Version]"$Version.$Patch"
+        return $NewVersion.ToString()
+}

From 76f7e3ee05925549c4c4907719a8d57d2243db02 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 2 Dec 2021 12:11:11 +0100
Subject: [PATCH 008/121] Test versioning

---
 .../templates/publishModule/action.yml        |  12 +-
 .../ms.storage.storageaccounts copy.yml       | 187 ++++++++++++++++++
 2 files changed, 193 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/ms.storage.storageaccounts copy.yml

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 41f3019cb8..9cb67d705f 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -14,7 +14,7 @@ inputs:
   templateSpecsDescription:
     description: 'Required to publish to template spec. Description of the template spec to publish to'
     required: false
-  publishToTemplateSpecs:
+  templateSpecsDoPublish:
     description: 'Flag to indicate whether or not to publish to template specs'
     default: 'false'
     required: false
@@ -24,7 +24,7 @@ inputs:
   bicepRegistryRgName:
     description: 'Required to publish to private bicep registry. Location of the container registry resource group'
     required: false
-  publishToBicepRegistry:
+  bicepRegistryDoPublish:
     description: 'Flag to indicate whether or not to publish to the private bicep registry'
     default: 'false'
     required: false
@@ -68,11 +68,11 @@ runs:
 
     - name: 'Publish module to template specs'
       shell: pwsh
-      # if: ${{ inputs.publishToTemplateSpecs == 'true' }}
+      # if: ${{ inputs.templateSpecsDoPublish == 'true' }}
       run: |
         # Workaround until composite actions support conditions
         # Once available, remove this if and enable the step condition
-        if('${{ inputs.publishToTemplateSpecs }}' -eq 'true') {
+        if('${{ inputs.templateSpecsDoPublish }}' -eq 'true') {
 
           # Load used functions
           . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
@@ -95,11 +95,11 @@ runs:
 
     - name: 'Publish module to private bicep registry'
       shell: pwsh
-      # if: ${{ inputs.publishToBicepRegistry == 'true' }}
+      # if: ${{ inputs.bicepRegistryDoPublish == 'true' }}
       run: |
         # Workaround until composite actions support conditions
         # Once available, remove this if and enable the step condition
-        if('${{ inputs.publishToBicepRegistry }}' -eq 'true') {
+        if('${{ inputs.bicepRegistryDoPublish }}' -eq 'true') {
 
           # Load used functions
           . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
diff --git a/.github/workflows/ms.storage.storageaccounts copy.yml b/.github/workflows/ms.storage.storageaccounts copy.yml
new file mode 100644
index 0000000000..a775d83ad9
--- /dev/null
+++ b/.github/workflows/ms.storage.storageaccounts copy.yml	
@@ -0,0 +1,187 @@
+name: '_ Publishing_Test: Storage: StorageAccounts'
+
+on:
+  workflow_dispatch:
+    inputs:
+      removeDeployment:
+        type: boolean
+        description: 'Remove deployed module'
+        required: false
+        default: 'true'
+
+  push:
+    #branches:
+    #  - main
+    paths:
+      - '.github/actions/templates/**'
+      - '.github/workflows/ms.storage.storageaccounts.yml'
+      - 'arm/Microsoft.Storage/storageAccounts/**'
+      - '!*/**/readme.md'
+
+env:
+  modulePath: 'arm/Microsoft.Storage/storageAccounts'
+  workflowPath: '.github/workflows/ms.storage.storageaccounts.yml'
+  AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
+  ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+  ARM_MGMTGROUP_ID: '${{ secrets.ARM_MGMTGROUP_ID }}'
+  ARM_TENANT_ID: '${{ secrets.ARM_TENANT_ID }}'
+  DEPLOYMENT_SP_ID: '${{ secrets.DEPLOYMENT_SP_ID }}'
+
+jobs:
+  ############################
+  #   SET INPUT PARAMETERS   #
+  ############################
+  job_set_workflow_param:
+    runs-on: ubuntu-20.04
+    name: 'Set input parameters to output variables'
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: 'Set input parameters'
+        id: get-workflow-param
+        uses: ./.github/actions/templates/getWorkflowInput
+        with:
+          workflowPath: '${{ env.workflowPath}}'
+    outputs:
+      removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
+      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
+      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
+
+  ##################
+  #   UNIT TESTS   #
+  ##################
+  # Global tests
+  # ------------
+#  job_tests_module_global:
+#    runs-on: ubuntu-20.04
+#    name: 'Run global module tests'
+#    steps:
+#      - name: 'Checkout'
+#        uses: actions/checkout@v2
+#        with:
+#          fetch-depth: 0
+#      - name: 'Test module'
+#        uses: ./.github/actions/templates/validateModuleGeneral
+#        with:
+#          modulePath: '${{ env.modulePath }}'
+#
+#  # Global API tests
+#  # ----------------
+#  job_tests_module_global_api:
+#    runs-on: ubuntu-20.04
+#    name: 'Run global API module tests'
+#    steps:
+#      - name: 'Checkout'
+#        uses: actions/checkout@v2
+#        with:
+#          fetch-depth: 0
+#      - name: 'Test module'
+#        uses: ./.github/actions/templates/validateModuleApis
+#        with:
+#          modulePath: '${{ env.modulePath }}'
+#
+#  ###########################
+#  # Deployment module tests #
+#  ###########################
+#  job_module_deploy_validation:
+#    runs-on: ubuntu-20.04
+#    name: 'Run deployment validation module tests'
+#    needs:
+#      - job_set_workflow_param
+#      - job_tests_module_global
+#      - job_tests_module_global_api
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        parameterFilePaths:
+#          ['parameters.json', 'min.parameters.json', 'v1.parameters.json']
+#    steps:
+#      - name: 'Checkout'
+#        uses: actions/checkout@v2
+#        with:
+#          fetch-depth: 0
+#      - name: Set environment variables
+#        uses: deep-mm/set-variables@v1.0
+#        with:
+#          # Name of variable file
+#          variableFileName: 'variables.module' # Don't write .json here
+#      # ----------- #
+#      ##  Dry Run  ##
+#      # ----------- #
+#      - name: 'Test module with parameter file [${{ matrix.parameterFilePaths }}]'
+#        uses: ./.github/actions/templates/validateModuleDeploy
+#        with:
+#          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
+#          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
+#          location: '${{ env.defaultLocation }}'
+#          resourceGroupName: '${{ env.resourceGroupName }}'
+#          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+#          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
+#      # ------------------- #
+#      ##  Deploy & Remove  ##
+#      # ------------------- #
+#      - name: 'Deploy module with parameter file [${{ matrix.parameterFilePaths }}]'
+#        id: step_deploy
+#        uses: ./.github/actions/templates/deployModule
+#        with:
+#          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
+#          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
+#          location: '${{ env.defaultLocation }}'
+#          resourceGroupName: '${{ env.resourceGroupName }}'
+#          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+#          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
+#          removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}'
+
+  ###############
+  #   PUBLISH   #
+  ###############
+#  job_publish_module_templateSpec:
+#    name: 'Publish module - Template Spec'
+#    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref, eq('${{ env.templateSpecsDoPublish }}', 'true'))
+#    runs-on: ubuntu-20.04
+#    needs:
+#      - job_set_workflow_param
+#      - job_module_deploy_validation
+#    steps:
+#      - name: 'Checkout'
+#        uses: actions/checkout@v2
+#        with:
+#          fetch-depth: 0
+#      - name: Set environment variables
+#        uses: deep-mm/set-variables@v1.0
+#        with:
+#          # Name of variable file
+#          variableFileName: 'variables.module' # Don't write .json here
+#      - name: 'Publish module'
+#        uses: ./.github/actions/templates/publishModule
+#        with:
+#          templateSpecsRGName: '${{ env.templateSpecsRGName }}'
+#          templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
+#          templateSpecsDescription: '${{ env.templateSpecsDescription }}'
+
+
+  job_publish_module_bicep:
+    name: 'Publish module - Bicep'
+    #if: and(contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref), eq('${{ env.bicepRegistryDoPublish }}', 'true'))
+    runs-on: ubuntu-20.04
+    needs:
+      - job_set_workflow_param
+      #- job_deploy_module
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set environment variables
+        uses: deep-mm/set-variables@v1.0
+        with:
+          # Name of variable file
+          variableFileName: 'variables.module' # Don't write .json here
+      - name: 'Publish module'
+        uses: ./.github/actions/templates/publishModule
+        with:
+          bicepRegistryName: '${{ env.bicepRegistryName }}'
+          bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
+          bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'

From 4c6e63ec821e1dbd8122b33dd1098b95551976c5 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 2 Dec 2021 12:29:50 +0100
Subject: [PATCH 009/121] test

---
 .../templates/publishModule/action.yml        |  19 ---
 .../ms.storage.storageaccounts copy.yml       |  29 +++-
 .../Get-ChangedChildResources.ps1             |  79 -----------
 .../resourcePublish/Get-ChangedModules.ps1    | 130 ++++++++++++++++++
 .../resourcePublish/Set-ModuleVersion.ps1     |  44 ------
 5 files changed, 153 insertions(+), 148 deletions(-)
 delete mode 100644 utilities/pipelines/resourcePublish/Get-ChangedChildResources.ps1
 create mode 100644 utilities/pipelines/resourcePublish/Get-ChangedModules.ps1
 delete mode 100644 utilities/pipelines/resourcePublish/Set-ModuleVersion.ps1

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 9cb67d705f..fdf7876938 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -47,25 +47,6 @@ runs:
         creds: ${{ env.AZURE_CREDENTIALS }}
         enable-AzPSSession: true
 
-    - name: 'Generate version number'
-      id: 'versionNumber'
-      shell: pwsh
-      run: |
-        # Load used functions
-        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Set-VersionNumber.ps1')
-
-        $functionInput = @{
-          ModuleFilePath         = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
-        }
-
-        Write-Verbose "Invoke task with" -Verbose
-        Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
-
-        $ModuleVersion = Get-ModuleVersion @functionInput -Verbose
-
-        Write-Output "Module version is: $ModuleVersion"
-        Write-Output "::set-output name=versionNumber::$ModuleVersion"
-
     - name: 'Publish module to template specs'
       shell: pwsh
       # if: ${{ inputs.templateSpecsDoPublish == 'true' }}
diff --git a/.github/workflows/ms.storage.storageaccounts copy.yml b/.github/workflows/ms.storage.storageaccounts copy.yml
index a775d83ad9..eae2b4433a 100644
--- a/.github/workflows/ms.storage.storageaccounts copy.yml	
+++ b/.github/workflows/ms.storage.storageaccounts copy.yml	
@@ -179,9 +179,26 @@ jobs:
         with:
           # Name of variable file
           variableFileName: 'variables.module' # Don't write .json here
-      - name: 'Publish module'
-        uses: ./.github/actions/templates/publishModule
-        with:
-          bicepRegistryName: '${{ env.bicepRegistryName }}'
-          bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
-          bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
+      - name: 'Generate version number'
+        id: 'versionNumber'
+        shell: pwsh
+        run: |
+          # Load used functions
+          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ChangedModules.ps1')
+
+          $functionInput = @{
+            ModuleFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
+          }
+
+          Write-Output "Invoke task with"
+          Write-Output ($functionInput | ConvertTo-Json | Out-String)
+
+          # Get the changed child resources
+          Get-ChangedModules @functionInput -Verbose
+
+#      - name: 'Publish module'
+#        uses: ./.github/actions/templates/publishModule
+#        with:
+#          bicepRegistryName: '${{ env.bicepRegistryName }}'
+#          bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
+#          bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
diff --git a/utilities/pipelines/resourcePublish/Get-ChangedChildResources.ps1 b/utilities/pipelines/resourcePublish/Get-ChangedChildResources.ps1
deleted file mode 100644
index c78124be36..0000000000
--- a/utilities/pipelines/resourcePublish/Get-ChangedChildResources.ps1
+++ /dev/null
@@ -1,79 +0,0 @@
-function Get-ChangedFiles {
-    [CmdletBinding()]
-    param (
-        [Parameter(Position = 0)]
-        [string] $Commit = 'HEAD^',
-
-        [Parameter(Position = 1)]
-        [string] $CompareCommit = 'HEAD'
-    )
-    $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
-    $ChangedFiles = $Diff | Get-Item
-    return $ChangedFiles
-}
-
-function Get-ChangedModuleFiles {
-    [CmdletBinding()]
-    $ChangedModuleFiles = Get-ChangedFiles | Where-Object { $_.Name -eq 'deploy.bicep' }
-    return $ChangedModuleFiles
-}
-
-function Get-ModuleName {
-    [CmdletBinding()]
-    param (
-        [Parameter(ValueFromPipeline)]
-        [string]
-        $Path
-    )
-    $FolderPath = Split-Path -Path $Path -Parent
-    $ModuleName = $FolderPath.Replace('/','\').Split('\arm\')[-1].Replace('\', '.').ToLower()
-    return $ModuleName
-}
-
-function Get-ParentModule {
-    param (
-        [Parameter(ValueFromPipeline)]
-        [string]
-        $Path,
-
-        [Parameter()]
-        [switch] $Recurse
-
-    )
-
-    $File = Get-Item -Path $Path
-    $ParentDeployFilePath = Join-Path $File.Directory.Parent.FullName 'deploy.bicep'
-    if (-not (Test-Path -Path $ParentDeployFilePath)) {
-        Write-Verbose "No parent deploy file found at: $ParentDeployFilePath"
-        return
-    }
-    $ParentModules = @($ParentDeployFilePath)
-    if ($Recurse) {
-        $ParentModules += Get-ParentModule $ParentDeployFilePath -Recurse
-    }
-    return $ParentModules
-}
-
-function Update-ChangedModule {
-    [CmdletBinding()]
-    param (
-        [Parameter(ValueFromPipelineByPropertyName)]
-        [string] $ModulePath = 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
-    )
-
-    $ModulePath = $Path
-    $ModuleName = Get-ModuleName -Path $ModulePath
-
-    $ParentModules = Get-ParentModule $ModulePath
-    Update-ChangedModule $ParentModules
-}
-
-# Read version file
-Get-ChangedModuleFiles | ForEach-Object {
-    $ModuleName = $_.FullName | Get-ModuleName
-    $ModuleVersion = $_.FullName | Get-ModuleVersion
-
-    Write-Output "Update: $ModuleName - $ModuleVersion"
-    $ParentModules = $_.FullName | Get-ParentModule
-    Update-ChangedModule $ParentModules
-}
diff --git a/utilities/pipelines/resourcePublish/Get-ChangedModules.ps1 b/utilities/pipelines/resourcePublish/Get-ChangedModules.ps1
new file mode 100644
index 0000000000..cbe2f1c922
--- /dev/null
+++ b/utilities/pipelines/resourcePublish/Get-ChangedModules.ps1
@@ -0,0 +1,130 @@
+function Get-ChangedFiles {
+    [CmdletBinding()]
+    param (
+        [Parameter(Position = 0)]
+        [string] $Commit = 'HEAD^',
+
+        [Parameter(Position = 1)]
+        [string] $CompareCommit = 'HEAD'
+    )
+    $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
+    $ChangedFiles = $Diff | Get-Item
+    return $ChangedFiles
+}
+
+function Get-ChangedModuleFiles {
+    [CmdletBinding()]
+    $ChangedModuleFiles = Get-ChangedFiles | Where-Object { $_.Name -eq 'deploy.bicep' }
+    return $ChangedModuleFiles
+}
+
+function Get-ModuleName {
+    [CmdletBinding()]
+    param (
+        [Parameter(ValueFromPipeline)]
+        [string]
+        $ModuleFilePath
+    )
+    $FolderPath = Split-Path -Path $ModuleFilePath -Parent
+    $ModuleName = $FolderPath.Replace('/','\').Split('\arm\')[-1].Replace('\', '.').ToLower()
+    return $ModuleName
+}
+
+function Get-ParentModule {
+    param (
+        [Parameter(ValueFromPipeline)]
+        [string]
+        $Path,
+
+        [Parameter()]
+        [switch] $Recurse
+
+    )
+
+    $File = Get-Item -Path $Path
+    $ParentDeployFilePath = Join-Path $File.Directory.Parent.FullName 'deploy.bicep'
+    if (-not (Test-Path -Path $ParentDeployFilePath)) {
+        Write-Verbose "No parent deploy file found at: $ParentDeployFilePath"
+        return
+    }
+    $ParentModules = @($ParentDeployFilePath)
+    if ($Recurse) {
+        $ParentModules += Get-ParentModule $ParentDeployFilePath -Recurse
+    }
+    return $ParentModules
+}
+
+function Update-ChangedModule {
+    [CmdletBinding()]
+    param (
+        [Parameter(ValueFromPipelineByPropertyName)]
+        [string] $ModulePath = 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+    )
+
+    $ModulePath = $Path
+    $ModuleName = Get-ModuleName -Path $ModulePath
+
+    $ParentModules = Get-ParentModule $ModulePath
+    Update-ChangedModule $ParentModules
+}
+
+function Get-GitDistance {
+    [CmdletBinding()]
+    param (
+        [Parameter(Position = 0)]
+        [string] $Commit = 'HEAD^',
+
+        [Parameter(Position = 1)]
+        [string] $CompareCommit = 'HEAD'
+    )
+    $Distance = (git rev-list $Commit $CompareCommit).count - 1
+    return $Distance
+}
+
+function Get-ModuleVersion {
+    [CmdletBinding()]
+    param (
+        [Parameter(ValueFromPipeline)]
+        [string]
+        $ModuleFilePath
+    )
+    $ModuleFile = Get-Item -Path $ModuleFilePath
+    $ModuleFolder = Split-Path -Path $ModuleFile -Parent
+    $VersionFilePath = Join-Path $ModuleFolder 'version.json'
+
+    if (-not (Test-Path -Path $VersionFilePath)) {
+        throw "No version file found at: $VersionFilePath"
+    }
+
+    $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
+    $Version = $VersionFileContent.version
+
+    return $Version
+}
+
+function Get-NewModuleVersion {
+    [CmdletBinding()]
+    param (
+        $ModuleFilePath
+    )
+    $Version = Get-ModuleVersion -ModuleFilePath $ModuleFilePath
+    $Patch = Get-GitDistance
+    $NewVersion = [System.Version]"$Version.$Patch"
+    return $NewVersion.ToString()
+}
+
+function Get-ChangedModules {
+    # Read version file
+    Get-ChangedModuleFiles | ForEach-Object {
+        $ModuleName = Get-ModuleName -$_.FullName | Get-ModuleName
+        $ModuleVersion = Get-NewModuleVersion -ModuleFilePath $_.FullName
+
+        Write-Output "Update: $ModuleName - $ModuleVersion"
+        $ParentModules = $_.FullName | Get-ParentModule
+        $ParentModules | ForEach-Object {
+            $ParentModuleName = $_.FullName | Get-ModuleName
+            $ParentModuleVersion = Get-NewModuleVersion -ModuleFilePath $_.FullName
+            Write-Output "Update parent: $ParentModuleName - $ParentModuleVersion"
+        }
+    }
+}
diff --git a/utilities/pipelines/resourcePublish/Set-ModuleVersion.ps1 b/utilities/pipelines/resourcePublish/Set-ModuleVersion.ps1
deleted file mode 100644
index 74fb5d0552..0000000000
--- a/utilities/pipelines/resourcePublish/Set-ModuleVersion.ps1
+++ /dev/null
@@ -1,44 +0,0 @@
-function Get-GitDistance {
-    [CmdletBinding()]
-    param (
-        [Parameter(Position = 0)]
-        [string] $Commit = 'HEAD^',
-
-        [Parameter(Position = 1)]
-        [string] $CompareCommit = 'HEAD'
-    )
-    $Distance = (git rev-list $Commit $CompareCommit).count - 1
-    return $Distance
-}
-
-function Get-ModuleVersion {
-    [CmdletBinding()]
-    param (
-        [Parameter(ValueFromPipeline)]
-        [string]
-        $ModuleFilePath
-    )
-    $ModuleFile = Get-Item -Path $ModuleFilePath
-    $ModuleFolder = Split-Path -Path $ModuleFile -Parent
-    $VersionFilePath = Join-Path $ModuleFolder 'version.json'
-
-    if (-not (Test-Path -Path $VersionFilePath)) {
-        throw "No version file found at: $VersionFilePath"
-    }
-
-    $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
-    $Version = $VersionFileContent.version
-
-    return $Version
-}
-
-function Set-ModuleVersion {
-        [CmdletBinding()]
-        param (
-            $ModuleFilePath
-        )
-        $Version = Get-ModuleVersion -ModuleFilePath $ModuleFilePath
-        $Patch = Get-GitDistance
-        $NewVersion = [System.Version]"$Version.$Patch"
-        return $NewVersion.ToString()
-}

From b83a01e002d1aa1f3b8581c3ca4c60c7d0546dc1 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 2 Dec 2021 12:33:17 +0100
Subject: [PATCH 010/121] test

---
 .../pipelines/resourcePublish/Get-ChangedModules.ps1  | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ChangedModules.ps1 b/utilities/pipelines/resourcePublish/Get-ChangedModules.ps1
index cbe2f1c922..8bf815c61a 100644
--- a/utilities/pipelines/resourcePublish/Get-ChangedModules.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ChangedModules.ps1
@@ -8,6 +8,7 @@
         [string] $CompareCommit = 'HEAD'
     )
     $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
+    $Diff
     $ChangedFiles = $Diff | Get-Item
     return $ChangedFiles
 }
@@ -114,8 +115,16 @@ function Get-NewModuleVersion {
 }
 
 function Get-ChangedModules {
+    [CmdletBinding()]
+    param (
+        [Parameter()]
+        [string] $ModuleFilePath
+    )
     # Read version file
-    Get-ChangedModuleFiles | ForEach-Object {
+    $ChangedModuleFiles = Get-ChangedModuleFiles
+    $ChangedModuleFiles
+
+    $ChangedModuleFiles | ForEach-Object {
         $ModuleName = Get-ModuleName -$_.FullName | Get-ModuleName
         $ModuleVersion = Get-NewModuleVersion -ModuleFilePath $_.FullName
 

From 8fda15ebf88070f225ec4ac613dc3eb5a74ef26c Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 2 Dec 2021 12:34:55 +0100
Subject: [PATCH 011/121] test

---
 .github/workflows/ms.storage.storageaccounts copy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ms.storage.storageaccounts copy.yml b/.github/workflows/ms.storage.storageaccounts copy.yml
index eae2b4433a..fe16b4fb00 100644
--- a/.github/workflows/ms.storage.storageaccounts copy.yml	
+++ b/.github/workflows/ms.storage.storageaccounts copy.yml	
@@ -14,6 +14,7 @@ on:
     #  - main
     paths:
       - '.github/actions/templates/**'
+      - 'utilities/pipelines/**'
       - '.github/workflows/ms.storage.storageaccounts.yml'
       - 'arm/Microsoft.Storage/storageAccounts/**'
       - '!*/**/readme.md'

From a326aade7b7c8f61b54529dc8fdf19d0c50ff9f1 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 2 Dec 2021 12:35:47 +0100
Subject: [PATCH 012/121] test

---
 .github/workflows/ms.storage.storageaccounts copy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ms.storage.storageaccounts copy.yml b/.github/workflows/ms.storage.storageaccounts copy.yml
index fe16b4fb00..3e112ba09b 100644
--- a/.github/workflows/ms.storage.storageaccounts copy.yml	
+++ b/.github/workflows/ms.storage.storageaccounts copy.yml	
@@ -15,7 +15,7 @@ on:
     paths:
       - '.github/actions/templates/**'
       - 'utilities/pipelines/**'
-      - '.github/workflows/ms.storage.storageaccounts.yml'
+      - '.github/workflows/ms.storage.storageaccounts copy.yml'
       - 'arm/Microsoft.Storage/storageAccounts/**'
       - '!*/**/readme.md'
 

From 6deb6e1439e809b75c682560831db9b460665b6b Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 2 Dec 2021 12:59:25 +0100
Subject: [PATCH 013/121] test

---
 .github/workflows/ms.storage.storageaccounts copy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ms.storage.storageaccounts copy.yml b/.github/workflows/ms.storage.storageaccounts copy.yml
index 3e112ba09b..d20b34fba6 100644
--- a/.github/workflows/ms.storage.storageaccounts copy.yml	
+++ b/.github/workflows/ms.storage.storageaccounts copy.yml	
@@ -188,7 +188,7 @@ jobs:
           . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ChangedModules.ps1')
 
           $functionInput = @{
-            ModuleFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
+            ModuleFilePath = '${{ env.modulePath }}/deploy.bicep'
           }
 
           Write-Output "Invoke task with"

From 3cfa17c9f523e6ea11a27298c474dd10a7e3670b Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sun, 5 Dec 2021 22:31:10 +0100
Subject: [PATCH 014/121] Update Child resource

---
 .../templates/publishModule/action.yml        |  51 ++++-
 .../ms.storage.storageaccounts copy.yml       | 205 ------------------
 .../workflows/ms.storage.storageaccounts.yml  |  43 +---
 arm/Microsoft.Sql/servers/deploy.bicep        |   1 +
 .../immutabilityPolicies/version.json         |   4 +
 .../blobServices/containers/version.json      |   4 +
 .../storageAccounts/blobServices/version.json |   4 +
 .../fileServices/shares/version.json          |   4 +
 .../storageAccounts/fileServices/version.json |   4 +
 .../managementPolicies/version.json           |   4 +
 .../queueServices/queues/version.json         |   4 +
 .../queueServices/version.json                |   4 +
 .../tableServices/deploy.bicep                |   1 +
 .../tableServices/metadata.json               |   9 -
 .../tableServices/tables/deploy.bicep         |   1 +
 .../tableServices/tables/version.json         |   5 +-
 .../tableServices/version.json                |   5 +-
 .../storageAccounts/version.json              |   4 +
 .../resourcePublish/Get-ChangedModules.ps1    | 139 ------------
 .../resourcePublish/Get-ModifiedModules.ps1   | 181 ++++++++++++++++
 .../Publish-ModuleToPrivateBicepRegistry.ps1  |  64 ++----
 .../Publish-ModuleToTemplateSpec.ps1          |  46 ++--
 22 files changed, 307 insertions(+), 480 deletions(-)
 delete mode 100644 .github/workflows/ms.storage.storageaccounts copy.yml
 create mode 100644 arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/blobServices/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/fileServices/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/queueServices/version.json
 delete mode 100644 arm/Microsoft.Storage/storageAccounts/tableServices/metadata.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/version.json
 delete mode 100644 utilities/pipelines/resourcePublish/Get-ChangedModules.ps1
 create mode 100644 utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index fdf7876938..5844221cdc 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -56,20 +56,34 @@ runs:
         if('${{ inputs.templateSpecsDoPublish }}' -eq 'true') {
 
           # Load used functions
+          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModifiedModules.ps1')
           . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
 
           $functionInput = @{
-            templateFilePath         = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
-            templateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
-            templateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
-            templateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
-            ModuleVersion            = '${{ steps.versionNumber.outputs.versionNumber }}'
+            ModuleFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
           }
 
-          Write-Verbose "Invoke task with" -Verbose
-          Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+          Write-Output "Invoke task with"
+          Write-Output ($functionInput | ConvertTo-Json | Out-String)
+
+          # Get the modified child resources
+          $UpdatedModules = Get-ModifiedModules @functionInput -Verbose
+
+          # Publish the modified child resources
+          foreach ($UpdatedModule in $UpdatedModules) {
+            $functionInput = @{
+              templateFilePath         = $UpdatedModule.ModulePath
+              templateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
+              templateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
+              templateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
+              ModuleVersion            = $UpdatedModule.Version
+            }
+
+            Write-Verbose "Invoke task with" -Verbose
+            Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-          Publish-ModuleToTemplateSpec @functionInput -Verbose
+            Publish-ModuleToTemplateSpec @functionInput -Verbose
+          }
         } else {
           Write-Output "Pipeline is configured to not publish to TemplateSpecs"
         }
@@ -83,15 +97,28 @@ runs:
         if('${{ inputs.bicepRegistryDoPublish }}' -eq 'true') {
 
           # Load used functions
+          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModifiedModules.ps1')
           . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
 
           $functionInput = @{
-            templateFilePath    = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
-            bicepRegistryName   = '${{ inputs.bicepRegistryName }}'
-            bicepRegistryRgName = '${{ inputs.bicepRegistryRgName }}'
-            ModuleVersion       = '${{ steps.versionNumber.outputs.versionNumber }}'
+            ModuleFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
           }
 
+          Write-Output "Invoke task with"
+          Write-Output ($functionInput | ConvertTo-Json | Out-String)
+
+          # Get the modified child resources
+          $UpdatedModules = Get-ModifiedModules @functionInput -Verbose
+
+          # Publish the modified child resources
+          foreach ($UpdatedModule in $UpdatedModules) {
+            $functionInput = @{
+              templateFilePath    = $UpdatedModule.ModulePath
+              bicepRegistryName   = '${{ inputs.bicepRegistryName }}'
+              bicepRegistryRgName = '${{ inputs.bicepRegistryRgName }}'
+              ModuleVersion       = $UpdatedModule.Version
+            }
+
           Write-Verbose "Invoke task with" -Verbose
           Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
diff --git a/.github/workflows/ms.storage.storageaccounts copy.yml b/.github/workflows/ms.storage.storageaccounts copy.yml
deleted file mode 100644
index d20b34fba6..0000000000
--- a/.github/workflows/ms.storage.storageaccounts copy.yml	
+++ /dev/null
@@ -1,205 +0,0 @@
-name: '_ Publishing_Test: Storage: StorageAccounts'
-
-on:
-  workflow_dispatch:
-    inputs:
-      removeDeployment:
-        type: boolean
-        description: 'Remove deployed module'
-        required: false
-        default: 'true'
-
-  push:
-    #branches:
-    #  - main
-    paths:
-      - '.github/actions/templates/**'
-      - 'utilities/pipelines/**'
-      - '.github/workflows/ms.storage.storageaccounts copy.yml'
-      - 'arm/Microsoft.Storage/storageAccounts/**'
-      - '!*/**/readme.md'
-
-env:
-  modulePath: 'arm/Microsoft.Storage/storageAccounts'
-  workflowPath: '.github/workflows/ms.storage.storageaccounts.yml'
-  AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }}
-  ARM_SUBSCRIPTION_ID: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
-  ARM_MGMTGROUP_ID: '${{ secrets.ARM_MGMTGROUP_ID }}'
-  ARM_TENANT_ID: '${{ secrets.ARM_TENANT_ID }}'
-  DEPLOYMENT_SP_ID: '${{ secrets.DEPLOYMENT_SP_ID }}'
-
-jobs:
-  ############################
-  #   SET INPUT PARAMETERS   #
-  ############################
-  job_set_workflow_param:
-    runs-on: ubuntu-20.04
-    name: 'Set input parameters to output variables'
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: 'Set input parameters'
-        id: get-workflow-param
-        uses: ./.github/actions/templates/getWorkflowInput
-        with:
-          workflowPath: '${{ env.workflowPath}}'
-    outputs:
-      removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
-
-  ##################
-  #   UNIT TESTS   #
-  ##################
-  # Global tests
-  # ------------
-#  job_tests_module_global:
-#    runs-on: ubuntu-20.04
-#    name: 'Run global module tests'
-#    steps:
-#      - name: 'Checkout'
-#        uses: actions/checkout@v2
-#        with:
-#          fetch-depth: 0
-#      - name: 'Test module'
-#        uses: ./.github/actions/templates/validateModuleGeneral
-#        with:
-#          modulePath: '${{ env.modulePath }}'
-#
-#  # Global API tests
-#  # ----------------
-#  job_tests_module_global_api:
-#    runs-on: ubuntu-20.04
-#    name: 'Run global API module tests'
-#    steps:
-#      - name: 'Checkout'
-#        uses: actions/checkout@v2
-#        with:
-#          fetch-depth: 0
-#      - name: 'Test module'
-#        uses: ./.github/actions/templates/validateModuleApis
-#        with:
-#          modulePath: '${{ env.modulePath }}'
-#
-#  ###########################
-#  # Deployment module tests #
-#  ###########################
-#  job_module_deploy_validation:
-#    runs-on: ubuntu-20.04
-#    name: 'Run deployment validation module tests'
-#    needs:
-#      - job_set_workflow_param
-#      - job_tests_module_global
-#      - job_tests_module_global_api
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        parameterFilePaths:
-#          ['parameters.json', 'min.parameters.json', 'v1.parameters.json']
-#    steps:
-#      - name: 'Checkout'
-#        uses: actions/checkout@v2
-#        with:
-#          fetch-depth: 0
-#      - name: Set environment variables
-#        uses: deep-mm/set-variables@v1.0
-#        with:
-#          # Name of variable file
-#          variableFileName: 'variables.module' # Don't write .json here
-#      # ----------- #
-#      ##  Dry Run  ##
-#      # ----------- #
-#      - name: 'Test module with parameter file [${{ matrix.parameterFilePaths }}]'
-#        uses: ./.github/actions/templates/validateModuleDeploy
-#        with:
-#          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-#          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
-#          location: '${{ env.defaultLocation }}'
-#          resourceGroupName: '${{ env.resourceGroupName }}'
-#          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
-#          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
-#      # ------------------- #
-#      ##  Deploy & Remove  ##
-#      # ------------------- #
-#      - name: 'Deploy module with parameter file [${{ matrix.parameterFilePaths }}]'
-#        id: step_deploy
-#        uses: ./.github/actions/templates/deployModule
-#        with:
-#          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-#          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
-#          location: '${{ env.defaultLocation }}'
-#          resourceGroupName: '${{ env.resourceGroupName }}'
-#          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
-#          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
-#          removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}'
-
-  ###############
-  #   PUBLISH   #
-  ###############
-#  job_publish_module_templateSpec:
-#    name: 'Publish module - Template Spec'
-#    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref, eq('${{ env.templateSpecsDoPublish }}', 'true'))
-#    runs-on: ubuntu-20.04
-#    needs:
-#      - job_set_workflow_param
-#      - job_module_deploy_validation
-#    steps:
-#      - name: 'Checkout'
-#        uses: actions/checkout@v2
-#        with:
-#          fetch-depth: 0
-#      - name: Set environment variables
-#        uses: deep-mm/set-variables@v1.0
-#        with:
-#          # Name of variable file
-#          variableFileName: 'variables.module' # Don't write .json here
-#      - name: 'Publish module'
-#        uses: ./.github/actions/templates/publishModule
-#        with:
-#          templateSpecsRGName: '${{ env.templateSpecsRGName }}'
-#          templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
-#          templateSpecsDescription: '${{ env.templateSpecsDescription }}'
-
-
-  job_publish_module_bicep:
-    name: 'Publish module - Bicep'
-    #if: and(contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref), eq('${{ env.bicepRegistryDoPublish }}', 'true'))
-    runs-on: ubuntu-20.04
-    needs:
-      - job_set_workflow_param
-      #- job_deploy_module
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set environment variables
-        uses: deep-mm/set-variables@v1.0
-        with:
-          # Name of variable file
-          variableFileName: 'variables.module' # Don't write .json here
-      - name: 'Generate version number'
-        id: 'versionNumber'
-        shell: pwsh
-        run: |
-          # Load used functions
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ChangedModules.ps1')
-
-          $functionInput = @{
-            ModuleFilePath = '${{ env.modulePath }}/deploy.bicep'
-          }
-
-          Write-Output "Invoke task with"
-          Write-Output ($functionInput | ConvertTo-Json | Out-String)
-
-          # Get the changed child resources
-          Get-ChangedModules @functionInput -Verbose
-
-#      - name: 'Publish module'
-#        uses: ./.github/actions/templates/publishModule
-#        with:
-#          bicepRegistryName: '${{ env.bicepRegistryName }}'
-#          bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
-#          bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index 3ee7af5de1..6c9aa418ba 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -8,19 +8,6 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
-        required: false
-        default: '0.0.1'
   push:
     branches:
       - main
@@ -149,9 +136,9 @@ jobs:
   ###############
   #   PUBLISH   #
   ###############
-  job_publish_module_templateSpec:
-    name: 'Publish module - Template Spec'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref, eq('${{ env.templateSpecsDoPublish }}', 'true'))
+  job_publish_module:
+    name: 'Publish module'
+    #if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,31 +156,11 @@ jobs:
       - name: 'Publish module'
         uses: ./.github/actions/templates/publishModule
         with:
+          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
-
-
-  job_publish_module_bicep:
-    name: 'Publish module - Bicep'
-    if: and(contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref), eq('${{ env.bicepRegistryDoPublish }}', 'true'))
-    runs-on: ubuntu-20.04
-    needs:
-      - job_set_workflow_param
-      - job_deploy_module
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set environment variables
-        uses: deep-mm/set-variables@v1.0
-        with:
-          # Name of variable file
-          variableFileName: 'variables.module' # Don't write .json here
-      - name: 'Publish module'
-        uses: ./.github/actions/templates/publishModule
-        with:
+          templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
           bicepRegistryName: '${{ env.bicepRegistryName }}'
           bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
           bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'
diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/arm/Microsoft.Sql/servers/deploy.bicep
index 0bb9ed0970..c04bf3ad40 100644
--- a/arm/Microsoft.Sql/servers/deploy.bicep
+++ b/arm/Microsoft.Sql/servers/deploy.bicep
@@ -25,6 +25,7 @@ param userAssignedIdentities object = {}
 @description('Optional. Specify the type of lock.')
 param lock string = 'NotSpecified'
 
+
 @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'')
 param roleAssignments array = []
 
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/version.json b/arm/Microsoft.Storage/storageAccounts/fileServices/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/fileServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json b/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/version.json b/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
index 08b5bc7737..029bd8e80e 100644
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
@@ -16,6 +16,7 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
+
 resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = {
   name: storageAccountName
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/metadata.json b/arm/Microsoft.Storage/storageAccounts/tableServices/metadata.json
deleted file mode 100644
index 242c68e64c..0000000000
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/metadata.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#",
-    "type": "Module",
-    "itemDisplayName": "This module deploys a storage account table service",
-    "description": "This module deploys a storage account table service",
-    "summary": "This module deploys a storage account table service using apiVersion 2021-04-01.",
-    "githubUsername": "commitOwner",
-    "dateUpdated": "2021-11-17"
-}
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
index 972418fc6a..8e354fda20 100644
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
@@ -24,6 +24,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing
   }
 }
 
+
 resource table 'Microsoft.Storage/storageAccounts/tableServices/tables@2021-06-01' = {
   name: name
   parent: storageAccount::tableServices
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
index 115ed689f8..08ec8d7491 100644
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
@@ -1,7 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.4",
-    "cloudBuild": {
-        "setVersionVariables": false
-    }
+    "version": "0.3"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/version.json b/arm/Microsoft.Storage/storageAccounts/tableServices/version.json
index 115ed689f8..08ec8d7491 100644
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/version.json
@@ -1,7 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.4",
-    "cloudBuild": {
-        "setVersionVariables": false
-    }
+    "version": "0.3"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/version.json b/arm/Microsoft.Storage/storageAccounts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/utilities/pipelines/resourcePublish/Get-ChangedModules.ps1 b/utilities/pipelines/resourcePublish/Get-ChangedModules.ps1
deleted file mode 100644
index 8bf815c61a..0000000000
--- a/utilities/pipelines/resourcePublish/Get-ChangedModules.ps1
+++ /dev/null
@@ -1,139 +0,0 @@
-function Get-ChangedFiles {
-    [CmdletBinding()]
-    param (
-        [Parameter(Position = 0)]
-        [string] $Commit = 'HEAD^',
-
-        [Parameter(Position = 1)]
-        [string] $CompareCommit = 'HEAD'
-    )
-    $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
-    $Diff
-    $ChangedFiles = $Diff | Get-Item
-    return $ChangedFiles
-}
-
-function Get-ChangedModuleFiles {
-    [CmdletBinding()]
-    $ChangedModuleFiles = Get-ChangedFiles | Where-Object { $_.Name -eq 'deploy.bicep' }
-    return $ChangedModuleFiles
-}
-
-function Get-ModuleName {
-    [CmdletBinding()]
-    param (
-        [Parameter(ValueFromPipeline)]
-        [string]
-        $ModuleFilePath
-    )
-    $FolderPath = Split-Path -Path $ModuleFilePath -Parent
-    $ModuleName = $FolderPath.Replace('/','\').Split('\arm\')[-1].Replace('\', '.').ToLower()
-    return $ModuleName
-}
-
-function Get-ParentModule {
-    param (
-        [Parameter(ValueFromPipeline)]
-        [string]
-        $Path,
-
-        [Parameter()]
-        [switch] $Recurse
-
-    )
-
-    $File = Get-Item -Path $Path
-    $ParentDeployFilePath = Join-Path $File.Directory.Parent.FullName 'deploy.bicep'
-    if (-not (Test-Path -Path $ParentDeployFilePath)) {
-        Write-Verbose "No parent deploy file found at: $ParentDeployFilePath"
-        return
-    }
-    $ParentModules = @($ParentDeployFilePath)
-    if ($Recurse) {
-        $ParentModules += Get-ParentModule $ParentDeployFilePath -Recurse
-    }
-    return $ParentModules
-}
-
-function Update-ChangedModule {
-    [CmdletBinding()]
-    param (
-        [Parameter(ValueFromPipelineByPropertyName)]
-        [string] $ModulePath = 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
-    )
-
-    $ModulePath = $Path
-    $ModuleName = Get-ModuleName -Path $ModulePath
-
-    $ParentModules = Get-ParentModule $ModulePath
-    Update-ChangedModule $ParentModules
-}
-
-function Get-GitDistance {
-    [CmdletBinding()]
-    param (
-        [Parameter(Position = 0)]
-        [string] $Commit = 'HEAD^',
-
-        [Parameter(Position = 1)]
-        [string] $CompareCommit = 'HEAD'
-    )
-    $Distance = (git rev-list $Commit $CompareCommit).count - 1
-    return $Distance
-}
-
-function Get-ModuleVersion {
-    [CmdletBinding()]
-    param (
-        [Parameter(ValueFromPipeline)]
-        [string]
-        $ModuleFilePath
-    )
-    $ModuleFile = Get-Item -Path $ModuleFilePath
-    $ModuleFolder = Split-Path -Path $ModuleFile -Parent
-    $VersionFilePath = Join-Path $ModuleFolder 'version.json'
-
-    if (-not (Test-Path -Path $VersionFilePath)) {
-        throw "No version file found at: $VersionFilePath"
-    }
-
-    $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
-    $Version = $VersionFileContent.version
-
-    return $Version
-}
-
-function Get-NewModuleVersion {
-    [CmdletBinding()]
-    param (
-        $ModuleFilePath
-    )
-    $Version = Get-ModuleVersion -ModuleFilePath $ModuleFilePath
-    $Patch = Get-GitDistance
-    $NewVersion = [System.Version]"$Version.$Patch"
-    return $NewVersion.ToString()
-}
-
-function Get-ChangedModules {
-    [CmdletBinding()]
-    param (
-        [Parameter()]
-        [string] $ModuleFilePath
-    )
-    # Read version file
-    $ChangedModuleFiles = Get-ChangedModuleFiles
-    $ChangedModuleFiles
-
-    $ChangedModuleFiles | ForEach-Object {
-        $ModuleName = Get-ModuleName -$_.FullName | Get-ModuleName
-        $ModuleVersion = Get-NewModuleVersion -ModuleFilePath $_.FullName
-
-        Write-Output "Update: $ModuleName - $ModuleVersion"
-        $ParentModules = $_.FullName | Get-ParentModule
-        $ParentModules | ForEach-Object {
-            $ParentModuleName = $_.FullName | Get-ModuleName
-            $ParentModuleVersion = Get-NewModuleVersion -ModuleFilePath $_.FullName
-            Write-Output "Update parent: $ParentModuleName - $ParentModuleVersion"
-        }
-    }
-}
diff --git a/utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1 b/utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1
new file mode 100644
index 0000000000..c2d8604fd1
--- /dev/null
+++ b/utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1
@@ -0,0 +1,181 @@
+function Get-ModifiedFiles {
+    [CmdletBinding()]
+    param (
+        [Parameter(Position = 0)]
+        [string] $Commit = 'HEAD^',
+
+        [Parameter(Position = 1)]
+        [string] $CompareCommit = 'HEAD'
+    )
+    $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
+    $ModifiedFiles = $Diff | Get-Item
+    Write-Verbose 'The following files have been modified:'
+    $ModifiedFiles | ForEach-Object {
+        Write-Verbose "   $($_.FullName)"
+    }
+    return $ModifiedFiles
+}
+
+function Find-ModuleFile {
+    [CmdletBinding()]
+    param (
+        [Parameter()]
+        [string]
+        $Path
+    )
+
+    $FolderPath = Split-Path $Path -Parent
+    $FolderName = Split-Path $Path -Leaf
+    if ($FolderName -eq 'arm') {
+        return $null
+    }
+    $ModuleFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.bicep'
+    if (-not (Test-Path $ModuleFilePath)) {
+        return Find-ModuleFile $FolderPath
+    }
+
+    return $ModuleFilePath | Get-Item
+}
+
+function Get-ModifiedModuleFiles {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $ModuleFolderPath
+    )
+    $ModifiedFiles = Get-ModifiedFiles -Verbose
+    Write-Verbose "Looking for modified modules under : '$ModuleFolderPath'"
+    $ModifiedModuleAuxFiles = $ModifiedFiles | Where-Object { $_.FullName -like "*$ModuleFolderPath*" }
+
+    $ModifiedModuleFiles = $ModifiedModuleAuxFiles | ForEach-Object {
+        Find-ModuleFile -Path $($_.FullName) -Verbose
+    } | Sort-Object -Property FullName -Unique -Descending
+
+    if ($ModifiedModuleFiles.Count -eq 0) {
+        throw 'No Modified module files found.'
+    }
+
+    Write-Verbose "Modified modules found : $($ModifiedModuleFiles.count)"
+    $ModifiedModuleFiles | ForEach-Object {
+        Write-Verbose "   $($_.FullName)"
+    }
+
+    return $ModifiedModuleFiles
+}
+
+function Get-ParentModule {
+    [CmdletBinding()]
+    param (
+        [Parameter()]
+        [string]
+        $ModuleFilePath,
+
+        [Parameter()]
+        [switch] $Recurse
+
+    )
+
+    $ModuleFolderPath = Split-Path $ModuleFilePath -Parent
+    $ParentFolderPath = Split-Path $ModuleFolderPath -Parent
+    $ParentDeployFilePath = Join-Path $ParentFolderPath 'deploy.bicep'
+    if (-not (Test-Path -Path $ParentDeployFilePath)) {
+        Write-Verbose "No parent deploy file found at: $ParentDeployFilePath"
+        return
+    }
+    Write-Verbose "Parent deploy file found at: $ParentDeployFilePath"
+    $ParentModuleFiles = New-Object -TypeName System.Collections.ArrayList
+    $ParentModuleFiles += $ParentDeployFilePath | Get-Item
+    if ($Recurse) {
+        $ParentModuleFiles += Get-ParentModule $ParentDeployFilePath -Recurse
+    }
+    return $ParentModuleFiles
+}
+
+function Get-GitDistance {
+    [CmdletBinding()]
+    param (
+        [Parameter(Position = 0)]
+        [string] $Commit = 'HEAD^',
+
+        [Parameter(Position = 1)]
+        [string] $CompareCommit = 'HEAD'
+    )
+    $Distance = (git rev-list $Commit $CompareCommit).count - 1
+    return $Distance
+}
+
+function Get-ModuleVersion {
+    [CmdletBinding()]
+    param (
+        [Parameter(ValueFromPipeline)]
+        [string]
+        $ModuleFilePath
+    )
+    $ModuleFile = Get-Item -Path $ModuleFilePath
+    $ModuleFolder = Split-Path -Path $ModuleFile -Parent
+    $VersionFilePath = Join-Path $ModuleFolder 'version.json'
+
+    if (-not (Test-Path -Path $VersionFilePath)) {
+        throw "No version file found at: $VersionFilePath"
+    }
+
+    $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
+    $Version = $VersionFileContent.version
+
+    return $Version
+}
+
+function Get-NewModuleVersion {
+    [CmdletBinding()]
+    param (
+        $ModuleFilePath
+    )
+    $Version = Get-ModuleVersion -ModuleFilePath $ModuleFilePath
+    $Patch = Get-GitDistance
+    $CurrentBranch = git branch --show-current
+    if ($CurrentBranch -ne 'main') {
+        $Patch = "$Patch-$CurrentBranch".Replace('\','').Replace('/','')
+    }
+    $NewVersion = [System.Version]"$Version.$Patch"
+    return $NewVersion.ToString()
+}
+
+function Get-ModifiedModules {
+    [CmdletBinding()]
+    param (
+        [Parameter()]
+        [string] $ModuleFilePath
+    )
+
+    $ModuleFolderPath = Split-Path $ModuleFilePath -Parent
+
+    $ModifiedModuleFiles = Get-ModifiedModuleFiles -ModuleFolderPath $ModuleFolderPath
+
+    $ModulesToUpdate = New-Object -TypeName System.Collections.ArrayList
+    $ModifiedModuleFiles | Sort-Object FullName -Descending | ForEach-Object {
+        $ModuleVersion = Get-NewModuleVersion -ModuleFilePath $_.FullName
+        $ModulesToUpdate += [pscustomobject]@{
+            Version = $ModuleVersion
+            ModulePath = $_.FullName
+        }
+        Write-Output "Update: $ModuleName - $ModuleVersion"
+
+        Write-Output 'Checking for parent modules'
+        $ParentModuleFiles = Get-ParentModule -ModuleFilePath $_ -Recurse
+        Write-Output "Checking for parent modules - Found $($ParentModuleFiles.Count)"
+        $ParentModuleFiles
+        $ParentModuleFiles | ForEach-Object {
+            $ParentModuleVersion = Get-NewModuleVersion -ModuleFilePath $_.FullName
+
+            $ModulesToUpdate += [pscustomobject]@{
+                Version    = $ParentModuleVersion
+                ModulePath = $_.FullName
+            }
+            Write-Output "Update parent: $ParentModuleName - $ParentModuleVersion"
+        }
+    }
+
+    $ModulesToUpdate = $ModulesToUpdate | Sort-Object Name -Descending -Unique
+
+    return $ModulesToUpdate
+}
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index 9bbc0e8beb..96b9f989c8 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -4,39 +4,36 @@ Publish a new version of a given module to a private bicep registry
 
 .DESCRIPTION
 Publish a new version of a given module to a private bicep registry
-The function will take evaluate which version should be published based on the provided input parameters (moduleVersion, ) and the version currently deployed to the private bicep registry
-If the moduleVersion is higher than the current latest, it has the highest priority over the other options
-Otherwise, one of the provided version options is chosen and applied with the default being 'patch'
 
-.PARAMETER templateFilePath
+.PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
 
-.PARAMETER bicepRegistryName
+.PARAMETER BicepRegistryName
 Mandatory. Name of the private bicep registry to publish to.
 
-.PARAMETER bicepRegistryRgName
+.PARAMETER BicepRegistryRgName
 Mandatory. ResourceGroup of the private bicep registry to publish to.
 
-.PARAMETER moduleVersion
-Optional. A custom version that can be provided by the UI. '-' represents an empty value.
+.PARAMETER ModuleVersion
+Required. Version of the module to publish.
 
 .EXAMPLE
-Publish-ModuleToPrivateBicepRegistry -templateFilePath 'C:/KeyVault/deploy.json' -bicepRegistryRgName 'artifacts-rg' -moduleVersion '3.0.0'
+Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:/KeyVault/deploy.json' -BicepRegistryRgName 'artifacts-rg' -ModuleVersion '3.0.0-alpha'
 
-Try to publish the KeyVault module with version 3.0.0 to a private bicep registry called KeyVault based on a value provided in the UI
+Try to publish the KeyVault module with version 3.0.0-alpha to a private bicep registry called KeyVault based on a value provided in the UI
 #>
 function Publish-ModuleToPrivateBicepRegistry {
 
     [CmdletBinding(SupportsShouldProcess)]
     param (
         [Parameter(Mandatory)]
-        [string] $templateFilePath,
+        [string] $TemplateFilePath,
 
         [Parameter(Mandatory)]
-        [string] $bicepRegistryRgName,
+        [string] $BicepRegistryRgName,
 
         [Parameter(Mandatory)]
-        [string] $bicepRegistryName,
+        [string] $BicepRegistryName,
 
         [Parameter(Mandatory)]
         [string] $ModuleVersion
@@ -50,48 +47,23 @@ function Publish-ModuleToPrivateBicepRegistry {
         #############################
         ##    EVALUATE RESOURCES   ##
         #############################
-        if ((Split-Path $templateFilePath -Extension) -ne '.bicep') {
-            throw "The template in path [$templateFilePath] is no bicep template."
+        if ((Split-Path $TemplateFilePath -Extension) -ne '.bicep') {
+            throw "The template in path [$TemplateFilePath] is no bicep template."
         }
 
         # Registry
-        if (-not (Get-AzContainerRegistry -ResourceGroupName $bicepRegistryRgName -Name $bicepRegistryName -ErrorAction 'SilentlyContinue')) {
-            if ($PSCmdlet.ShouldProcess("Container Registry [$bicepRegistryName] to resource group [$bicepRegistryRgName]", 'Deploy')) {
-                New-AzContainerRegistry -ResourceGroupName $bicepRegistryRgName -Name $bicepRegistryName -Sku 'Basic'
+        if (-not (Get-AzContainerRegistry -ResourceGroupName $BicepRegistryRgName -Name $BicepRegistryName -ErrorAction 'SilentlyContinue')) {
+            if ($PSCmdlet.ShouldProcess("Container Registry [$BicepRegistryName] to resource group [$BicepRegistryRgName]", 'Deploy')) {
+                New-AzContainerRegistry -ResourceGroupName $BicepRegistryRgName -Name $BicepRegistryName -Sku 'Basic'
             }
         }
 
-        #################################
-        ##    FIND AVAILABLE VERSION   ##
-        #################################
-        # Extracts Microsoft.KeyVault/vaults from e.g. C:\arm\Microsoft.KeyVault\vaults\deploy.bicep
-        $moduleIdentifier = (Split-Path $templateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
-        $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
-
-        if (-not ($repositories = Get-AzContainerRegistryRepository -RegistryName $bicepRegistryName -ErrorAction 'SilentlyContinue')) {
-            # No repositories yet
-            $repositories = @()
-        }
-
-        if ($repositories.Contains($moduleRegistryIdentifier)) {
-            $versions = (Get-AzContainerRegistryTag -RegistryName $bicepRegistryName -RepositoryName $moduleRegistryIdentifier).Tags.Name
-            $latestVersion = (($versions -as [Version[]]) | Measure-Object -Maximum).Maximum
-            Write-Verbose "Published versions detected in private bicep registry [$moduleIdentifier]. Fetched latest [$latestVersion]."
-        } else {
-            Write-Verbose "No version for module reference [$moduleRegistryIdentifier] detected in private bicep registry [$bicepRegistryName]. Creating new."
-            $latestVersion = New-Object System.Version('0.0.0')
-        }
-
-        if($latestVersion -ge $ModuleVersion) {
-            throw "The version [$ModuleVersion] is not higher than the latest version [$latestVersion] in the private bicep registry [$bicepRegistryName]."
-        }
-
         #############################################
         ##    Publish to private bicep registry    ##
         #############################################
-        $publishingTarget = 'br:{0}.azurecr.io/{1}:{2}' -f $bicepRegistryName, $moduleRegistryIdentifier, $newVersion
-        if ($PSCmdlet.ShouldProcess("Private bicep registry entry [$moduleRegistryIdentifier] version [$newVersion] to registry [$bicepRegistryName]", 'Publish')) {
-            bicep publish $templateFilePath --target $publishingTarget
+        $publishingTarget = 'br:{0}.azurecr.io/{1}:{2}' -f $BicepRegistryName, $moduleRegistryIdentifier, $ModuleVersion
+        if ($PSCmdlet.ShouldProcess("Private bicep registry entry [$moduleRegistryIdentifier] version [$ModuleVersion] to registry [$BicepRegistryName]", 'Publish')) {
+            bicep publish $TemplateFilePath --target $publishingTarget
         }
         Write-Verbose 'Publish complete'
     }
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
index 8d39aaddb3..6c8f90ca01 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
@@ -4,29 +4,25 @@ Publish a new version of a given module to a template spec
 
 .DESCRIPTION
 Publish a new version of a given module to a template spec
-The function will take evaluate which version should be published based on the provided input parameters (ModuleVersion, versioningOption) and the version currently deployed to the template spec
-If the customVersion is higher than the current latest, it has the highest priority over the other options
-Otherwise, one of the provided version options is chosen and applied with the default being 'patch'
-
 The template spec is set up if not already existing.
 
-.PARAMETER templateFilePath
+.PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
 
-.PARAMETER templateSpecsRgName
+.PARAMETER TemplateSpecsRgName
 Mandatory. ResourceGroup of the template spec to publish to.
 
 .PARAMETER templateSpecsRgLocation
 Mandatory. Location of the template spec resource group.
 
-.PARAMETER templateSpecsDescription
+.PARAMETER TemplateSpecsDescription
 Mandatory. The description of the parent template spec.
 
 .PARAMETER ModuleVersion
-Optional. A custom/generated version for the module.
+Required. Version of the module to publish.
 
 .EXAMPLE
-Publish-ModuleToTemplateSpec -templateFilePath 'C:/KeyVault/deploy.json' -templateSpecsRgName 'artifacts-rg' -templateSpecsRgLocation 'West Europe' -templateSpecsDescription 'iacs key vault' -customVersion '3.0.0'
+Publish-ModuleToTemplateSpec -TemplateFilePath 'C:/KeyVault/deploy.json' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault' -ModuleVersion '3.0.0-alpha'
 
 Try to publish the KeyVault module with version 3.0.0 to a template spec called KeyVault based on a value provided in the UI
 #>
@@ -35,19 +31,23 @@ function Publish-ModuleToTemplateSpec {
     [CmdletBinding(SupportsShouldProcess)]
     param (
         [Parameter(Mandatory)]
-        [string] $templateFilePath,
+        [string] $TemplateFilePath,
 
         [Parameter(Mandatory)]
-        [string] $templateSpecsRgName,
+        [string] $TemplateSpecsRgName,
 
         [Parameter(Mandatory)]
         [string] $templateSpecsRgLocation,
 
         [Parameter(Mandatory)]
-        [string] $templateSpecsDescription,
+        [string] $TemplateSpecsDescription,
 
-        [Parameter(Mandatory)]
-        [string] $ModuleVersion
+        [Parameter(Mandatory = $false)]
+        [string] $customVersion = '0.0.1',
+
+        [Parameter(Mandatory = $false)]
+        [ValidateSet('Major', 'Minor', 'Patch')]
+        [string] $versioningOption = 'Patch'
     )
 
     begin {
@@ -55,29 +55,29 @@ function Publish-ModuleToTemplateSpec {
     }
 
     process {
-        $moduleIdentifier = (Split-Path $templateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
+        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
         $templateSpecIdentifier = $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
 
         #############################
         ##    EVALUATE RESOURCES   ##
         #############################
-        if (-not (Get-AzResourceGroup -Name $templateSpecsRgName -ErrorAction 'SilentlyContinue')) {
-            if ($PSCmdlet.ShouldProcess("Resource group [$templateSpecsRgName] to location [$templateSpecsRgLocation]", 'Deploy')) {
-                New-AzResourceGroup -Name $templateSpecsRgName -Location $templateSpecsRgLocation
+        if (-not (Get-AzResourceGroup -Name $TemplateSpecsRgName -ErrorAction 'SilentlyContinue')) {
+            if ($PSCmdlet.ShouldProcess("Resource group [$TemplateSpecsRgName] to location [$templateSpecsRgLocation]", 'Deploy')) {
+                New-AzResourceGroup -Name $TemplateSpecsRgName -Location $templateSpecsRgLocation
             }
         }
 
         ################################
         ##    Create template spec    ##
         ################################
-        if ($PSCmdlet.ShouldProcess("Template spec [$templateSpecIdentifier] version [$ModuleVersion]", 'Publish')) {
+        if ($PSCmdlet.ShouldProcess("Template spec [$templateSpecIdentifier] version [$newVersion]", 'Publish')) {
             $templateSpecInputObject = @{
-                ResourceGroupName = $templateSpecsRgName
+                ResourceGroupName = $TemplateSpecsRgName
                 Name              = $templateSpecIdentifier
-                Version           = $ModuleVersion
-                Description       = $templateSpecsDescription
+                Version           = $newVersion
+                Description       = $TemplateSpecsDescription
                 Location          = $templateSpecsRgLocation
-                TemplateFile      = $templateFilePath
+                TemplateFile      = $TemplateFilePath
             }
             New-AzTemplateSpec @templateSpecInputObject -Force
         }

From 99f330fda65bd794d3ae92a781087c7be3def169 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sun, 5 Dec 2021 22:36:51 +0100
Subject: [PATCH 015/121] reset

---
 .vscode/settings.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 88b820abd5..8b56df2cb7 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -23,11 +23,7 @@
     "markdown.extension.orderedList.marker": "one",
     "markdown.extension.tableFormatter.enabled": false,
     "markdownlint.config": {
-        "MD034": true,
-        "MD028": false,
-        "MD025": {
-            "front_matter_title": ""
-        }
+        "MD034": true
     },
     "powershell.codeFormatting.autoCorrectAliases": true,
     "powershell.codeFormatting.newLineAfterCloseBrace": false,

From 9981cb68a7ea4e6da3c91046e82ce4a49f374d54 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sun, 5 Dec 2021 22:37:30 +0100
Subject: [PATCH 016/121] reset

---
 arm/Microsoft.Sql/servers/deploy.bicep | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arm/Microsoft.Sql/servers/deploy.bicep b/arm/Microsoft.Sql/servers/deploy.bicep
index 32ff7bf04f..cd2fc6746e 100644
--- a/arm/Microsoft.Sql/servers/deploy.bicep
+++ b/arm/Microsoft.Sql/servers/deploy.bicep
@@ -25,7 +25,6 @@ param userAssignedIdentities object = {}
 @description('Optional. Specify the type of lock.')
 param lock string = 'NotSpecified'
 
-
 @description('Optional. Array of role assignment objects that contain the \'roleDefinitionIdOrName\' and \'principalId\' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: \'/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11\'')
 param roleAssignments array = []
 

From bb5704f34a6e17f0ac0d3f00deb592f80e910b88 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Sun, 5 Dec 2021 22:46:54 +0100
Subject: [PATCH 017/121] Update StorageAccount

---
 .../blobServices/containers/immutabilityPolicies/version.json | 4 ----
 .../storageAccounts/blobServices/containers/version.json      | 4 ----
 .../storageAccounts/blobServices/version.json                 | 4 ----
 .../storageAccounts/managementPolicies/version.json           | 4 ----
 .../storageAccounts/queueServices/queues/version.json         | 4 ----
 .../storageAccounts/queueServices/version.json                | 4 ----
 6 files changed, 24 deletions(-)
 delete mode 100644 arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
 delete mode 100644 arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
 delete mode 100644 arm/Microsoft.Storage/storageAccounts/blobServices/version.json
 delete mode 100644 arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
 delete mode 100644 arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
 delete mode 100644 arm/Microsoft.Storage/storageAccounts/queueServices/version.json

diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
deleted file mode 100644
index 08ec8d7491..0000000000
--- a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
-}
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
deleted file mode 100644
index 08ec8d7491..0000000000
--- a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
-}
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
deleted file mode 100644
index 08ec8d7491..0000000000
--- a/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
-}
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json b/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
deleted file mode 100644
index 08ec8d7491..0000000000
--- a/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
-}
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
deleted file mode 100644
index 08ec8d7491..0000000000
--- a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
-}
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/version.json b/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
deleted file mode 100644
index 08ec8d7491..0000000000
--- a/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
-}

From 033916cef1c8fe93ddc8330a992a55cbd6a8c532 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Mon, 6 Dec 2021 00:51:02 +0100
Subject: [PATCH 018/121] Publish new stuff

---
 .../templates/publishModule/action.yml        |   7 +-
 .../workflows/ms.storage.storageaccounts.yml  | 164 +++++++++---------
 .../tableServices/deploy.bicep                |   1 -
 .../tableServices/tables/deploy.bicep         |   1 -
 .../resourcePublish/Get-ModifiedModules.ps1   |  22 +--
 .../Publish-ModuleToPrivateBicepRegistry.ps1  |   4 +
 .../Publish-ModuleToTemplateSpec.ps1          |  12 +-
 7 files changed, 106 insertions(+), 105 deletions(-)

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 5844221cdc..d40913c303 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -119,10 +119,11 @@ runs:
               ModuleVersion       = $UpdatedModule.Version
             }
 
-          Write-Verbose "Invoke task with" -Verbose
-          Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+            Write-Verbose "Invoke task with" -Verbose
+            Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-          Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
+            Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
+          }
         } else {
           Write-Output "Pipeline is configured to not publish to TemplateSpecs"
         }
diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index 6c9aa418ba..33a06f0c71 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -9,8 +9,8 @@ on:
         required: false
         default: 'true'
   push:
-    branches:
-      - main
+    #branches:
+    #  - main
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.storage.storageaccounts.yml'
@@ -53,85 +53,85 @@ jobs:
   ##################
   # Global tests
   # ------------
-  job_tests_module_global:
-    runs-on: ubuntu-20.04
-    name: 'Run global module tests'
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: 'Test module'
-        uses: ./.github/actions/templates/validateModuleGeneral
-        with:
-          modulePath: '${{ env.modulePath }}'
-
-  # Global API tests
-  # ----------------
-  job_tests_module_global_api:
-    runs-on: ubuntu-20.04
-    name: 'Run global API module tests'
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: 'Test module'
-        uses: ./.github/actions/templates/validateModuleApis
-        with:
-          modulePath: '${{ env.modulePath }}'
-
-  ###########################
-  # Deployment module tests #
-  ###########################
-  job_module_deploy_validation:
-    runs-on: ubuntu-20.04
-    name: 'Run deployment validation module tests'
-    needs:
-      - job_set_workflow_param
-      - job_tests_module_global
-      - job_tests_module_global_api
-    strategy:
-      fail-fast: false
-      matrix:
-        parameterFilePaths:
-          ['parameters.json', 'min.parameters.json', 'v1.parameters.json']
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set environment variables
-        uses: deep-mm/set-variables@v1.0
-        with:
-          # Name of variable file
-          variableFileName: 'variables.module' # Don't write .json here
-      # ----------- #
-      ##  Dry Run  ##
-      # ----------- #
-      - name: 'Test module with parameter file [${{ matrix.parameterFilePaths }}]'
-        uses: ./.github/actions/templates/validateModuleDeploy
-        with:
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
-          location: '${{ env.defaultLocation }}'
-          resourceGroupName: '${{ env.resourceGroupName }}'
-          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
-          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
-      # ------------------- #
-      ##  Deploy & Remove  ##
-      # ------------------- #
-      - name: 'Deploy module with parameter file [${{ matrix.parameterFilePaths }}]'
-        id: step_deploy
-        uses: ./.github/actions/templates/deployModule
-        with:
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
-          location: '${{ env.defaultLocation }}'
-          resourceGroupName: '${{ env.resourceGroupName }}'
-          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
-          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
-          removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}'
+#  job_tests_module_global:
+#    runs-on: ubuntu-20.04
+#    name: 'Run global module tests'
+#    steps:
+#      - name: 'Checkout'
+#        uses: actions/checkout@v2
+#        with:
+#          fetch-depth: 0
+#      - name: 'Test module'
+#        uses: ./.github/actions/templates/validateModuleGeneral
+#        with:
+#          modulePath: '${{ env.modulePath }}'
+#
+#  # Global API tests
+#  # ----------------
+#  job_tests_module_global_api:
+#    runs-on: ubuntu-20.04
+#    name: 'Run global API module tests'
+#    steps:
+#      - name: 'Checkout'
+#        uses: actions/checkout@v2
+#        with:
+#          fetch-depth: 0
+#      - name: 'Test module'
+#        uses: ./.github/actions/templates/validateModuleApis
+#        with:
+#          modulePath: '${{ env.modulePath }}'
+#
+#  ###########################
+#  # Deployment module tests #
+#  ###########################
+#  job_module_deploy_validation:
+#    runs-on: ubuntu-20.04
+#    name: 'Run deployment validation module tests'
+#    needs:
+#      - job_set_workflow_param
+#      - job_tests_module_global
+#      - job_tests_module_global_api
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        parameterFilePaths:
+#          ['parameters.json', 'min.parameters.json', 'v1.parameters.json']
+#    steps:
+#      - name: 'Checkout'
+#        uses: actions/checkout@v2
+#        with:
+#          fetch-depth: 0
+#      - name: Set environment variables
+#        uses: deep-mm/set-variables@v1.0
+#        with:
+#          # Name of variable file
+#          variableFileName: 'variables.module' # Don't write .json here
+#      # ----------- #
+#      ##  Dry Run  ##
+#      # ----------- #
+#      - name: 'Test module with parameter file [${{ matrix.parameterFilePaths }}]'
+#        uses: ./.github/actions/templates/validateModuleDeploy
+#        with:
+#          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
+#          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
+#          location: '${{ env.defaultLocation }}'
+#          resourceGroupName: '${{ env.resourceGroupName }}'
+#          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+#          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
+#      # ------------------- #
+#      ##  Deploy & Remove  ##
+#      # ------------------- #
+#      - name: 'Deploy module with parameter file [${{ matrix.parameterFilePaths }}]'
+#        id: step_deploy
+#        uses: ./.github/actions/templates/deployModule
+#        with:
+#          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
+#          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
+#          location: '${{ env.defaultLocation }}'
+#          resourceGroupName: '${{ env.resourceGroupName }}'
+#          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+#          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
+#          removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}'
 
   ###############
   #   PUBLISH   #
@@ -142,7 +142,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
-      - job_module_deploy_validation
+      #- job_module_deploy_validation
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
index 029bd8e80e..08b5bc7737 100644
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/deploy.bicep
@@ -16,7 +16,6 @@ module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) {
   params: {}
 }
 
-
 resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing = {
   name: storageAccountName
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
index 8e354fda20..972418fc6a 100644
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/deploy.bicep
@@ -24,7 +24,6 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-06-01' existing
   }
 }
 
-
 resource table 'Microsoft.Storage/storageAccounts/tableServices/tables@2021-06-01' = {
   name: name
   parent: storageAccount::tableServices
diff --git a/utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1 b/utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1
index c2d8604fd1..77706f0e21 100644
--- a/utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1
@@ -132,12 +132,15 @@ function Get-NewModuleVersion {
     )
     $Version = Get-ModuleVersion -ModuleFilePath $ModuleFilePath
     $Patch = Get-GitDistance
+    $NewVersion = "$Version.$Patch"
+
     $CurrentBranch = git branch --show-current
     if ($CurrentBranch -ne 'main') {
-        $Patch = "$Patch-$CurrentBranch".Replace('\','').Replace('/','')
+        $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
+        $NewVersion = "$NewVersion-$PreRelease"
     }
-    $NewVersion = [System.Version]"$Version.$Patch"
-    return $NewVersion.ToString()
+
+    return $NewVersion
 }
 
 function Get-ModifiedModules {
@@ -158,12 +161,11 @@ function Get-ModifiedModules {
             Version = $ModuleVersion
             ModulePath = $_.FullName
         }
-        Write-Output "Update: $ModuleName - $ModuleVersion"
+        Write-Verbose "Update: $ModuleName - $ModuleVersion"
 
-        Write-Output 'Checking for parent modules'
-        $ParentModuleFiles = Get-ParentModule -ModuleFilePath $_ -Recurse
-        Write-Output "Checking for parent modules - Found $($ParentModuleFiles.Count)"
-        $ParentModuleFiles
+        Write-Verbose 'Checking for parent modules'
+        $ParentModuleFiles = Get-ParentModule -ModuleFilePath $_.FullName -Recurse
+        Write-Verbose "Checking for parent modules - Found $($ParentModuleFiles.Count)"
         $ParentModuleFiles | ForEach-Object {
             $ParentModuleVersion = Get-NewModuleVersion -ModuleFilePath $_.FullName
 
@@ -171,11 +173,11 @@ function Get-ModifiedModules {
                 Version    = $ParentModuleVersion
                 ModulePath = $_.FullName
             }
-            Write-Output "Update parent: $ParentModuleName - $ParentModuleVersion"
+            Write-Verbose "Update parent: $($_.FullName) - $ParentModuleVersion"
         }
     }
 
-    $ModulesToUpdate = $ModulesToUpdate | Sort-Object Name -Descending -Unique
+    $ModulesToUpdate = $ModulesToUpdate | Sort-Object ModulePath -Descending -Unique
 
     return $ModulesToUpdate
 }
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index 96b9f989c8..a83bf65300 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -58,6 +58,10 @@ function Publish-ModuleToPrivateBicepRegistry {
             }
         }
 
+        # Extracts Microsoft.KeyVault/vaults from e.g. C:\arm\Microsoft.KeyVault\vaults\deploy.bicep
+        $moduleIdentifier = (Split-Path $templateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
+        $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
+
         #############################################
         ##    Publish to private bicep registry    ##
         #############################################
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
index 6c8f90ca01..1dd6f9b5ea 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
@@ -42,12 +42,8 @@ function Publish-ModuleToTemplateSpec {
         [Parameter(Mandatory)]
         [string] $TemplateSpecsDescription,
 
-        [Parameter(Mandatory = $false)]
-        [string] $customVersion = '0.0.1',
-
-        [Parameter(Mandatory = $false)]
-        [ValidateSet('Major', 'Minor', 'Patch')]
-        [string] $versioningOption = 'Patch'
+        [Parameter(Mandatory)]
+        [string] $ModuleVersion
     )
 
     begin {
@@ -70,11 +66,11 @@ function Publish-ModuleToTemplateSpec {
         ################################
         ##    Create template spec    ##
         ################################
-        if ($PSCmdlet.ShouldProcess("Template spec [$templateSpecIdentifier] version [$newVersion]", 'Publish')) {
+        if ($PSCmdlet.ShouldProcess("Template spec [$templateSpecIdentifier] version [$ModuleVersion]", 'Publish')) {
             $templateSpecInputObject = @{
                 ResourceGroupName = $TemplateSpecsRgName
                 Name              = $templateSpecIdentifier
-                Version           = $newVersion
+                Version           = $ModuleVersion
                 Description       = $TemplateSpecsDescription
                 Location          = $templateSpecsRgLocation
                 TemplateFile      = $TemplateFilePath

From d1f71c13c8585ec3c28c1869cc60bb17057bd6d8 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Wed, 8 Dec 2021 23:26:25 +0100
Subject: [PATCH 019/121] Cleaning code + doc

---
 .../templates/publishModule/action.yml        |  28 +-
 .../resourcePublish/Get-ModifiedModules.ps1   | 183 ---------
 .../resourcePublish/Get-ModulesToUpdate.ps1   | 367 ++++++++++++++++++
 .../Publish-ModuleToPrivateBicepRegistry.ps1  |   2 +-
 .../Publish-ModuleToTemplateSpec.ps1          |  10 +-
 5 files changed, 387 insertions(+), 203 deletions(-)
 delete mode 100644 utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1
 create mode 100644 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index d40913c303..5a17bd8cce 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -56,27 +56,27 @@ runs:
         if('${{ inputs.templateSpecsDoPublish }}' -eq 'true') {
 
           # Load used functions
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModifiedModules.ps1')
+          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
           . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
 
           $functionInput = @{
-            ModuleFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
+            TemplateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
           }
 
           Write-Output "Invoke task with"
           Write-Output ($functionInput | ConvertTo-Json | Out-String)
 
           # Get the modified child resources
-          $UpdatedModules = Get-ModifiedModules @functionInput -Verbose
+          $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
 
           # Publish the modified child resources
-          foreach ($UpdatedModule in $UpdatedModules) {
+          foreach ($ModuleToUpdate in $ModulesToUpdate) {
             $functionInput = @{
-              templateFilePath         = $UpdatedModule.ModulePath
+              templateFilePath         = $ModuleToUpdate.TemplateFilePath
               templateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
               templateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
               templateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
-              ModuleVersion            = $UpdatedModule.Version
+              ModuleVersion            = $ModuleToUpdate.Version
             }
 
             Write-Verbose "Invoke task with" -Verbose
@@ -97,26 +97,26 @@ runs:
         if('${{ inputs.bicepRegistryDoPublish }}' -eq 'true') {
 
           # Load used functions
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModifiedModules.ps1')
+          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
           . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
 
           $functionInput = @{
-            ModuleFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
+            TemplateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
           }
 
           Write-Output "Invoke task with"
           Write-Output ($functionInput | ConvertTo-Json | Out-String)
 
           # Get the modified child resources
-          $UpdatedModules = Get-ModifiedModules @functionInput -Verbose
+          $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
 
           # Publish the modified child resources
-          foreach ($UpdatedModule in $UpdatedModules) {
+          foreach ($ModuleToUpdate in $ModulesToUpdate) {
             $functionInput = @{
-              templateFilePath    = $UpdatedModule.ModulePath
-              bicepRegistryName   = '${{ inputs.bicepRegistryName }}'
-              bicepRegistryRgName = '${{ inputs.bicepRegistryRgName }}'
-              ModuleVersion       = $UpdatedModule.Version
+              TemplateFilePath    = $ModuleToUpdate.TemplateFilePath
+              BicepRegistryName   = '${{ inputs.bicepRegistryName }}'
+              BicepRegistryRgName = '${{ inputs.bicepRegistryRgName }}'
+              ModuleVersion       = $ModuleToUpdate.Version
             }
 
             Write-Verbose "Invoke task with" -Verbose
diff --git a/utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1 b/utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1
deleted file mode 100644
index 77706f0e21..0000000000
--- a/utilities/pipelines/resourcePublish/Get-ModifiedModules.ps1
+++ /dev/null
@@ -1,183 +0,0 @@
-function Get-ModifiedFiles {
-    [CmdletBinding()]
-    param (
-        [Parameter(Position = 0)]
-        [string] $Commit = 'HEAD^',
-
-        [Parameter(Position = 1)]
-        [string] $CompareCommit = 'HEAD'
-    )
-    $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
-    $ModifiedFiles = $Diff | Get-Item
-    Write-Verbose 'The following files have been modified:'
-    $ModifiedFiles | ForEach-Object {
-        Write-Verbose "   $($_.FullName)"
-    }
-    return $ModifiedFiles
-}
-
-function Find-ModuleFile {
-    [CmdletBinding()]
-    param (
-        [Parameter()]
-        [string]
-        $Path
-    )
-
-    $FolderPath = Split-Path $Path -Parent
-    $FolderName = Split-Path $Path -Leaf
-    if ($FolderName -eq 'arm') {
-        return $null
-    }
-    $ModuleFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.bicep'
-    if (-not (Test-Path $ModuleFilePath)) {
-        return Find-ModuleFile $FolderPath
-    }
-
-    return $ModuleFilePath | Get-Item
-}
-
-function Get-ModifiedModuleFiles {
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory)]
-        [string] $ModuleFolderPath
-    )
-    $ModifiedFiles = Get-ModifiedFiles -Verbose
-    Write-Verbose "Looking for modified modules under : '$ModuleFolderPath'"
-    $ModifiedModuleAuxFiles = $ModifiedFiles | Where-Object { $_.FullName -like "*$ModuleFolderPath*" }
-
-    $ModifiedModuleFiles = $ModifiedModuleAuxFiles | ForEach-Object {
-        Find-ModuleFile -Path $($_.FullName) -Verbose
-    } | Sort-Object -Property FullName -Unique -Descending
-
-    if ($ModifiedModuleFiles.Count -eq 0) {
-        throw 'No Modified module files found.'
-    }
-
-    Write-Verbose "Modified modules found : $($ModifiedModuleFiles.count)"
-    $ModifiedModuleFiles | ForEach-Object {
-        Write-Verbose "   $($_.FullName)"
-    }
-
-    return $ModifiedModuleFiles
-}
-
-function Get-ParentModule {
-    [CmdletBinding()]
-    param (
-        [Parameter()]
-        [string]
-        $ModuleFilePath,
-
-        [Parameter()]
-        [switch] $Recurse
-
-    )
-
-    $ModuleFolderPath = Split-Path $ModuleFilePath -Parent
-    $ParentFolderPath = Split-Path $ModuleFolderPath -Parent
-    $ParentDeployFilePath = Join-Path $ParentFolderPath 'deploy.bicep'
-    if (-not (Test-Path -Path $ParentDeployFilePath)) {
-        Write-Verbose "No parent deploy file found at: $ParentDeployFilePath"
-        return
-    }
-    Write-Verbose "Parent deploy file found at: $ParentDeployFilePath"
-    $ParentModuleFiles = New-Object -TypeName System.Collections.ArrayList
-    $ParentModuleFiles += $ParentDeployFilePath | Get-Item
-    if ($Recurse) {
-        $ParentModuleFiles += Get-ParentModule $ParentDeployFilePath -Recurse
-    }
-    return $ParentModuleFiles
-}
-
-function Get-GitDistance {
-    [CmdletBinding()]
-    param (
-        [Parameter(Position = 0)]
-        [string] $Commit = 'HEAD^',
-
-        [Parameter(Position = 1)]
-        [string] $CompareCommit = 'HEAD'
-    )
-    $Distance = (git rev-list $Commit $CompareCommit).count - 1
-    return $Distance
-}
-
-function Get-ModuleVersion {
-    [CmdletBinding()]
-    param (
-        [Parameter(ValueFromPipeline)]
-        [string]
-        $ModuleFilePath
-    )
-    $ModuleFile = Get-Item -Path $ModuleFilePath
-    $ModuleFolder = Split-Path -Path $ModuleFile -Parent
-    $VersionFilePath = Join-Path $ModuleFolder 'version.json'
-
-    if (-not (Test-Path -Path $VersionFilePath)) {
-        throw "No version file found at: $VersionFilePath"
-    }
-
-    $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
-    $Version = $VersionFileContent.version
-
-    return $Version
-}
-
-function Get-NewModuleVersion {
-    [CmdletBinding()]
-    param (
-        $ModuleFilePath
-    )
-    $Version = Get-ModuleVersion -ModuleFilePath $ModuleFilePath
-    $Patch = Get-GitDistance
-    $NewVersion = "$Version.$Patch"
-
-    $CurrentBranch = git branch --show-current
-    if ($CurrentBranch -ne 'main') {
-        $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
-        $NewVersion = "$NewVersion-$PreRelease"
-    }
-
-    return $NewVersion
-}
-
-function Get-ModifiedModules {
-    [CmdletBinding()]
-    param (
-        [Parameter()]
-        [string] $ModuleFilePath
-    )
-
-    $ModuleFolderPath = Split-Path $ModuleFilePath -Parent
-
-    $ModifiedModuleFiles = Get-ModifiedModuleFiles -ModuleFolderPath $ModuleFolderPath
-
-    $ModulesToUpdate = New-Object -TypeName System.Collections.ArrayList
-    $ModifiedModuleFiles | Sort-Object FullName -Descending | ForEach-Object {
-        $ModuleVersion = Get-NewModuleVersion -ModuleFilePath $_.FullName
-        $ModulesToUpdate += [pscustomobject]@{
-            Version = $ModuleVersion
-            ModulePath = $_.FullName
-        }
-        Write-Verbose "Update: $ModuleName - $ModuleVersion"
-
-        Write-Verbose 'Checking for parent modules'
-        $ParentModuleFiles = Get-ParentModule -ModuleFilePath $_.FullName -Recurse
-        Write-Verbose "Checking for parent modules - Found $($ParentModuleFiles.Count)"
-        $ParentModuleFiles | ForEach-Object {
-            $ParentModuleVersion = Get-NewModuleVersion -ModuleFilePath $_.FullName
-
-            $ModulesToUpdate += [pscustomobject]@{
-                Version    = $ParentModuleVersion
-                ModulePath = $_.FullName
-            }
-            Write-Verbose "Update parent: $($_.FullName) - $ParentModuleVersion"
-        }
-    }
-
-    $ModulesToUpdate = $ModulesToUpdate | Sort-Object ModulePath -Descending -Unique
-
-    return $ModulesToUpdate
-}
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
new file mode 100644
index 0000000000..61629a84c6
--- /dev/null
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -0,0 +1,367 @@
+#region Helper functions
+
+<#
+.SYNOPSIS
+Get modified files between two commits.
+
+.PARAMETER Commit
+A git reference to base the comparison on.
+
+.PARAMETER CompareCommit
+A git reference to compare with.
+
+.EXAMPLE
+Get-ModifiedFiles -Commit "HEAD^" -CompareCommit "HEAD"
+
+    Directory: C:\Repo\Azure\ResourceModules\utilities\pipelines\resourcePublish
+
+Mode                 LastWriteTime         Length Name
+----                 -------------         ------ ----
+la---          08.12.2021    15:50           7133 Script.ps1
+
+Get modified files between previous and current commit.
+#>
+function Get-ModifiedFiles {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        [string] $Commit = 'HEAD^',
+
+        [Parameter(Mandatory = $false)]
+        [string] $CompareCommit = 'HEAD'
+    )
+
+    Write-Verbose "Gathering modified files between [$Commit] and [$CompareCommit]"
+    $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
+    $ModifiedFiles = $Diff | Get-Item
+    Write-Verbose 'The following files have been modified:'
+    $ModifiedFiles | ForEach-Object {
+        Write-Verbose (' - [{0}]' -f $_.FullName)
+    }
+
+    return $ModifiedFiles
+}
+
+<#
+.SYNOPSIS
+Find the closest deploy.bicep/json file to the current directory/file.
+
+.DESCRIPTION
+This function will search the current directory and all parent directories for a deploy.bicep/json file.
+
+.PARAMETER Path
+Path to the folder/file that should be searched
+
+.EXAMPLE
+Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_cuaId.bicep"
+
+    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables
+
+Mode                 LastWriteTime         Length Name
+----                 -------------         ------ ----
+la---          05.12.2021    22:45           1230 deploy.bicep
+
+Gets the closest deploy.bicep/json file to the current directory.
+#>
+function Find-TemplateFile {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $Path
+    )
+
+    $FolderPath = Split-Path $Path -Parent
+    $FolderName = Split-Path $Path -Leaf
+    if ($FolderName -eq 'arm') {
+        return $null
+    }
+
+    #Prioritizing the bicep file
+    $TemplateFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.bicep'
+    if (-not (Test-Path $TemplateFilePath)) {
+        $TemplateFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.json'
+    }
+
+    if (-not (Test-Path $TemplateFilePath)) {
+        return Find-TemplateFile -Path $FolderPath
+    }
+
+    return $TemplateFilePath | Get-Item
+}
+
+<#
+.SYNOPSIS
+Find the closest deploy.bicep/json file to the changed files in the module folder structure.
+
+.DESCRIPTION
+Find the closest deploy.bicep/json file to the changed files in the module folder structure.
+
+.PARAMETER ModuleFolderPath
+Path to the main/parent module folder.
+
+.EXAMPLE
+Get-TemplateFileToUpdate -ModuleFolderPath "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\"
+
+C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep
+
+Gets the closest deploy.bicep/json file to the changed files in the module folder structure.
+Assuming there is a changed file in 'Microsoft.Storage\storageAccounts\tableServices\tables'
+the function would return the deploy.bicep file in the same folder.
+
+#>
+function Get-TemplateFileToUpdate {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $ModuleFolderPath
+    )
+
+    $ModifiedFiles = Get-ModifiedFiles -Verbose
+    Write-Verbose "Looking for modified files under: [$ModuleFolderPath]"
+    $ModifiedModuleFiles = $ModifiedFiles | Where-Object { $_.FullName -like "*$ModuleFolderPath*" }
+
+    $TemplateFilesToUpdate = $ModifiedModuleFiles | ForEach-Object {
+        Find-TemplateFile -Path $_.FullName -Verbose
+    } | Sort-Object -Property 'FullName' -Unique -Descending
+
+    if ($TemplateFilesToUpdate.Count -eq 0) {
+        throw 'No template file found in the modified module.'
+    }
+
+    Write-Verbose ('Modified modules found: [{0}]' -f $TemplateFilesToUpdate.count)
+    $TemplateFilesToUpdate | ForEach-Object {
+        Write-Verbose " - $($_.FullName)"
+    }
+
+    return $TemplateFilesToUpdate
+}
+
+<#
+.SYNOPSIS
+Gets the parent deploy.bicep/json file(s) to the changed files in the module folder structure.
+
+.DESCRIPTION
+Gets the parent deploy.bicep/json file(s) to the changed files in the module folder structure.
+
+.PARAMETER TemplateFilePath
+Path to a deploy.bicep/json file.
+
+.PARAMETER Recurse
+If true, the function will recurse up the folder structure to find the closest deploy.bicep/json file.
+
+.EXAMPLE
+Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep' -Recurse
+
+    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices
+
+Mode                 LastWriteTime         Length Name
+----                 -------------         ------ ----
+la---          05.12.2021    22:45           1427 deploy.bicep
+
+    Directory: C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts
+
+Mode                 LastWriteTime         Length Name
+----                 -------------         ------ ----
+la---          02.12.2021    13:19          10768 deploy.bicep
+
+Gets the parent deploy.bicep/json file(s) to the changed files in the module folder structure.
+
+#>
+function Get-ParentModuleTemplateFile {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $TemplateFilePath,
+
+        [Parameter(Mandatory = $false)]
+        [switch] $Recurse
+    )
+
+    $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
+    $ParentFolderPath = Split-Path $ModuleFolderPath -Parent
+
+    #Prioritizing the bicep file
+    $ParentTemplateFilePath = Join-Path -Path $ParentFolderPath -ChildPath 'deploy.bicep'
+    if (-not (Test-Path $TemplateFilePath)) {
+        $ParentTemplateFilePath = Join-Path -Path $ParentFolderPath -ChildPath 'deploy.json'
+    }
+
+    if (-not (Test-Path -Path $ParentTemplateFilePath)) {
+        Write-Verbose "No parent template file found at: [$ParentTemplateFilePath]"
+        return
+    }
+
+    Write-Verbose "Parent template file found at: [$ParentTemplateFilePath]"
+    $ParentTemplateFilesToUpdate = [System.Collections.ArrayList]@()
+    $ParentTemplateFilesToUpdate += $ParentTemplateFilePath | Get-Item
+
+    if ($Recurse) {
+        $ParentTemplateFilesToUpdate += Get-ParentModuleTemplateFile $ParentTemplateFilePath -Recurse
+    }
+
+    return $ParentTemplateFilesToUpdate
+}
+
+<#
+.SYNOPSIS
+Get the number of commits following the specified commit.
+
+.PARAMETER Commit
+A specified git reference to get commit counts on.
+
+.EXAMPLE
+Get-GitDistance -Commit origin/main.
+
+620
+
+There are currently 620 commits on origin/main. When run as a push on main, this will be the current commit number on the main branch.
+#>
+function Get-GitDistance {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory = $false)]
+        [string] $Commit = 'HEAD'
+    )
+
+    return (git rev-list $Commit --count)
+}
+
+<#
+.SYNOPSIS
+Gets the version file from the corresponding deploy.bicep/json file.
+
+.DESCRIPTION
+Gets the version file from the corresponding deploy.bicep/json file.
+The file needs to be in the same folder as the template file itself.
+
+.PARAMETER TemplateFilePath
+Path to a deploy.bicep/json file.
+
+.EXAMPLE
+Get-ModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+
+0.3
+
+Get the version file from the specified deploy.bicep file.
+#>
+function Get-ModuleVersion {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $TemplateFilePath
+    )
+
+    $ModuleFolder = Split-Path -Path $TemplateFilePath -Parent
+    $VersionFilePath = Join-Path -Path $ModuleFolder -ChildPath 'version.json'
+
+    if (-not (Test-Path -Path $VersionFilePath)) {
+        throw "No version file found at: $VersionFilePath"
+    }
+
+    $VersionFileContent = Get-Content $VersionFilePath | ConvertFrom-Json
+
+    return $VersionFileContent.version
+}
+
+<#
+.SYNOPSIS
+Generates a new version for the specified module.
+
+.DESCRIPTION
+Generates a new version for the specified module, based on version.json file and git commit count.
+Major and minor version numbers are gathered from the version.json file.
+Patch version number is calculated based on the git commit count on the branch.
+
+.PARAMETER TemplateFilePath
+Path to a deploy.bicep/json file.
+
+.EXAMPLE
+Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+
+0.3.630
+
+Generates a new version for the tables module.
+
+#>
+function Get-NewModuleVersion {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $TemplateFilePath
+    )
+
+    $Version = Get-ModuleVersion -TemplateFilePath $TemplateFilePath
+    $Patch = Get-GitDistance
+    $NewVersion = "$Version.$Patch"
+
+    $CurrentBranch = git branch --show-current
+    if ($CurrentBranch -ne 'main') {
+        $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
+        $NewVersion = "$NewVersion-Preview-$PreRelease"
+    }
+
+    return $NewVersion
+}
+
+#endregion
+
+<#
+.SYNOPSIS
+Generates a hashtable with template file paths to update with a new version.
+
+.DESCRIPTION
+Generates a hashtable with template file paths to update with a new version.
+
+.PARAMETER TemplateFilePath
+Path to a deploy.bicep/json file.
+
+.EXAMPLE
+Get-ModulesToUpdate -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+
+
+#>#
+function Get-ModulesToUpdate {
+
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory)]
+        [string] $TemplateFilePath
+    )
+
+    $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
+    $TemplateFilesToUpdate = Get-TemplateFileToUpdate -ModuleFolderPath $ModuleFolderPath | Sort-Object 'FullName' -Descending
+
+    $ModulesToUpdate = [System.Collections.ArrayList]@()
+
+    foreach ($TemplateFileToUpdate in $TemplateFilesToUpdate) {
+        $ModuleVersion = Get-NewModuleVersion -TemplateFilePath $TemplateFileToUpdate.FullName
+        $ModulesToUpdate += @{
+            Version      = $ModuleVersion
+            TemplateFilePath = $TemplateFileToUpdate.FullName
+        }
+
+        $ParentTemplateFilesToUpdate = Get-ParentModuleTemplateFile -TemplateFilePath $_.FullName -Recurse
+        foreach ($ParentTemplateFileToUpdate in $ParentTemplateFilesToUpdate) {
+            $ParentModuleVersion = Get-NewModuleVersion -TemplateFilePath $ParentTemplateFileToUpdate.FullName
+
+            $ModulesToUpdate += @{
+                Version      = $ParentModuleVersion
+                TemplateFilePath = $ParentTemplateFileToUpdate.FullName
+            }
+        }
+    }
+
+    $ModulesToUpdate = $ModulesToUpdate | Sort-Object 'TemplateFilePath' -Descending -Unique
+
+    $ModulesToUpdate | ForEach-Object {
+        Write-Verbose ('Update module: [{0}] [{1}] ' -f $_.TemplateFilePath, $_.Version)
+    }
+
+    return $ModulesToUpdate
+}
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index a83bf65300..39f60a337a 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -59,7 +59,7 @@ function Publish-ModuleToPrivateBicepRegistry {
         }
 
         # Extracts Microsoft.KeyVault/vaults from e.g. C:\arm\Microsoft.KeyVault\vaults\deploy.bicep
-        $moduleIdentifier = (Split-Path $templateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
+        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
         $moduleRegistryIdentifier = 'bicep/modules/{0}' -f $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
 
         #############################################
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
index 1dd6f9b5ea..990ba5a98c 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
@@ -12,7 +12,7 @@ Mandatory. Path to the module deployment file from root.
 .PARAMETER TemplateSpecsRgName
 Mandatory. ResourceGroup of the template spec to publish to.
 
-.PARAMETER templateSpecsRgLocation
+.PARAMETER TemplateSpecsRgLocation
 Mandatory. Location of the template spec resource group.
 
 .PARAMETER TemplateSpecsDescription
@@ -37,7 +37,7 @@ function Publish-ModuleToTemplateSpec {
         [string] $TemplateSpecsRgName,
 
         [Parameter(Mandatory)]
-        [string] $templateSpecsRgLocation,
+        [string] $TemplateSpecsRgLocation,
 
         [Parameter(Mandatory)]
         [string] $TemplateSpecsDescription,
@@ -58,8 +58,8 @@ function Publish-ModuleToTemplateSpec {
         ##    EVALUATE RESOURCES   ##
         #############################
         if (-not (Get-AzResourceGroup -Name $TemplateSpecsRgName -ErrorAction 'SilentlyContinue')) {
-            if ($PSCmdlet.ShouldProcess("Resource group [$TemplateSpecsRgName] to location [$templateSpecsRgLocation]", 'Deploy')) {
-                New-AzResourceGroup -Name $TemplateSpecsRgName -Location $templateSpecsRgLocation
+            if ($PSCmdlet.ShouldProcess("Resource group [$TemplateSpecsRgName] to location [$TemplateSpecsRgLocation]", 'Deploy')) {
+                New-AzResourceGroup -Name $TemplateSpecsRgName -Location $TemplateSpecsRgLocation
             }
         }
 
@@ -72,7 +72,7 @@ function Publish-ModuleToTemplateSpec {
                 Name              = $templateSpecIdentifier
                 Version           = $ModuleVersion
                 Description       = $TemplateSpecsDescription
-                Location          = $templateSpecsRgLocation
+                Location          = $TemplateSpecsRgLocation
                 TemplateFile      = $TemplateFilePath
             }
             New-AzTemplateSpec @templateSpecInputObject -Force

From 7370553d63acd9053d8bd625b79942b175f9aac8 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Wed, 8 Dec 2021 23:26:51 +0100
Subject: [PATCH 020/121] Adding prerelease function for workflow

---
 .github/workflows/ms.storage.storageaccounts.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index 33a06f0c71..4126eb1d96 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -8,9 +8,14 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
+        required: false
+        default: 'false'
   push:
-    #branches:
-    #  - main
+    branches:
+      - main
     paths:
       - '.github/actions/templates/**'
       - '.github/workflows/ms.storage.storageaccounts.yml'
@@ -45,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -138,7 +141,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    #if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || (${{ github.event.inputs.prerelease '}} == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param

From 5e6d209c1801d53155a9f1fccab94fb0158e7da3 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Wed, 8 Dec 2021 23:27:26 +0100
Subject: [PATCH 021/121] Adding test for modules to verify existance of
 variable.json fole

---
 arm/.global/global.module.tests.ps1 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arm/.global/global.module.tests.ps1 b/arm/.global/global.module.tests.ps1
index 4fb0598c88..eff8652baa 100644
--- a/arm/.global/global.module.tests.ps1
+++ b/arm/.global/global.module.tests.ps1
@@ -47,6 +47,11 @@ Describe 'File/folder tests' -Tag Modules {
             param( [string] $moduleFolderPath )
             (Test-Path (Join-Path -Path $moduleFolderPath '.parameters')) | Should -Be $true
         }
+
+        It '[<moduleFolderName>] Module should contain a [version.json] folder' -TestCases $moduleFolderTestCases {
+            param( [string] $moduleFolderPath )
+            (Test-Path (Join-Path -Path $moduleFolderPath 'version.json')) | Should -Be $true
+        }
     }
 
     Context '.parameters folder' {

From cc5993b927708f83871f58ccec4e9ab557c6b83a Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Wed, 8 Dec 2021 23:45:48 +0100
Subject: [PATCH 022/121] fix

---
 .github/workflows/ms.storage.storageaccounts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index 4126eb1d96..e9b0803ccc 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -141,7 +141,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || (${{ github.event.inputs.prerelease '}} == 'true')
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param

From 02d119f4c237dbdf8e40c31bf22b30004c0684de Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Thu, 9 Dec 2021 00:55:05 +0100
Subject: [PATCH 023/121] update

---
 .../workflows/ms.storage.storageaccounts.yml  | 160 +++++++++---------
 .../resourcePublish/Get-ModulesToUpdate.ps1   |  19 ++-
 2 files changed, 90 insertions(+), 89 deletions(-)

diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index e9b0803ccc..2938c8490b 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -56,85 +56,85 @@ jobs:
   ##################
   # Global tests
   # ------------
-#  job_tests_module_global:
-#    runs-on: ubuntu-20.04
-#    name: 'Run global module tests'
-#    steps:
-#      - name: 'Checkout'
-#        uses: actions/checkout@v2
-#        with:
-#          fetch-depth: 0
-#      - name: 'Test module'
-#        uses: ./.github/actions/templates/validateModuleGeneral
-#        with:
-#          modulePath: '${{ env.modulePath }}'
-#
-#  # Global API tests
-#  # ----------------
-#  job_tests_module_global_api:
-#    runs-on: ubuntu-20.04
-#    name: 'Run global API module tests'
-#    steps:
-#      - name: 'Checkout'
-#        uses: actions/checkout@v2
-#        with:
-#          fetch-depth: 0
-#      - name: 'Test module'
-#        uses: ./.github/actions/templates/validateModuleApis
-#        with:
-#          modulePath: '${{ env.modulePath }}'
-#
-#  ###########################
-#  # Deployment module tests #
-#  ###########################
-#  job_module_deploy_validation:
-#    runs-on: ubuntu-20.04
-#    name: 'Run deployment validation module tests'
-#    needs:
-#      - job_set_workflow_param
-#      - job_tests_module_global
-#      - job_tests_module_global_api
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        parameterFilePaths:
-#          ['parameters.json', 'min.parameters.json', 'v1.parameters.json']
-#    steps:
-#      - name: 'Checkout'
-#        uses: actions/checkout@v2
-#        with:
-#          fetch-depth: 0
-#      - name: Set environment variables
-#        uses: deep-mm/set-variables@v1.0
-#        with:
-#          # Name of variable file
-#          variableFileName: 'variables.module' # Don't write .json here
-#      # ----------- #
-#      ##  Dry Run  ##
-#      # ----------- #
-#      - name: 'Test module with parameter file [${{ matrix.parameterFilePaths }}]'
-#        uses: ./.github/actions/templates/validateModuleDeploy
-#        with:
-#          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-#          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
-#          location: '${{ env.defaultLocation }}'
-#          resourceGroupName: '${{ env.resourceGroupName }}'
-#          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
-#          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
-#      # ------------------- #
-#      ##  Deploy & Remove  ##
-#      # ------------------- #
-#      - name: 'Deploy module with parameter file [${{ matrix.parameterFilePaths }}]'
-#        id: step_deploy
-#        uses: ./.github/actions/templates/deployModule
-#        with:
-#          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-#          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
-#          location: '${{ env.defaultLocation }}'
-#          resourceGroupName: '${{ env.resourceGroupName }}'
-#          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
-#          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
-#          removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}'
+  job_tests_module_global:
+    runs-on: ubuntu-20.04
+    name: 'Run global module tests'
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: 'Test module'
+        uses: ./.github/actions/templates/validateModuleGeneral
+        with:
+          modulePath: '${{ env.modulePath }}'
+
+  # Global API tests
+  # ----------------
+  job_tests_module_global_api:
+    runs-on: ubuntu-20.04
+    name: 'Run global API module tests'
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: 'Test module'
+        uses: ./.github/actions/templates/validateModuleApis
+        with:
+          modulePath: '${{ env.modulePath }}'
+
+  ###########################
+  # Deployment module tests #
+  ###########################
+  job_module_deploy_validation:
+    runs-on: ubuntu-20.04
+    name: 'Run deployment validation module tests'
+    needs:
+      - job_set_workflow_param
+      - job_tests_module_global
+      - job_tests_module_global_api
+    strategy:
+      fail-fast: false
+      matrix:
+        parameterFilePaths:
+          ['parameters.json', 'min.parameters.json', 'v1.parameters.json']
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set environment variables
+        uses: deep-mm/set-variables@v1.0
+        with:
+          # Name of variable file
+          variableFileName: 'variables.module' # Don't write .json here
+      # ----------- #
+      ##  Dry Run  ##
+      # ----------- #
+      - name: 'Test module with parameter file [${{ matrix.parameterFilePaths }}]'
+        uses: ./.github/actions/templates/validateModuleDeploy
+        with:
+          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
+          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
+          location: '${{ env.defaultLocation }}'
+          resourceGroupName: '${{ env.resourceGroupName }}'
+          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
+      # ------------------- #
+      ##  Deploy & Remove  ##
+      # ------------------- #
+      - name: 'Deploy module with parameter file [${{ matrix.parameterFilePaths }}]'
+        id: step_deploy
+        uses: ./.github/actions/templates/deployModule
+        with:
+          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
+          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
+          location: '${{ env.defaultLocation }}'
+          resourceGroupName: '${{ env.resourceGroupName }}'
+          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
+          removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}'
 
   ###############
   #   PUBLISH   #
@@ -145,7 +145,7 @@ jobs:
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
-      #- job_module_deploy_validation
+      - job_module_deploy_validation
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 61629a84c6..fa6c326db9 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -125,7 +125,7 @@ function Get-TemplateFileToUpdate {
 
     $TemplateFilesToUpdate = $ModifiedModuleFiles | ForEach-Object {
         Find-TemplateFile -Path $_.FullName -Verbose
-    } | Sort-Object -Property 'FullName' -Unique -Descending
+    } | Sort-Object -Property FullName -Unique -Descending
 
     if ($TemplateFilesToUpdate.Count -eq 0) {
         throw 'No template file found in the modified module.'
@@ -335,32 +335,33 @@ function Get-ModulesToUpdate {
     )
 
     $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
-    $TemplateFilesToUpdate = Get-TemplateFileToUpdate -ModuleFolderPath $ModuleFolderPath | Sort-Object 'FullName' -Descending
+    $TemplateFilesToUpdate = Get-TemplateFileToUpdate -ModuleFolderPath $ModuleFolderPath | Sort-Object FullName -Descending
 
     $ModulesToUpdate = [System.Collections.ArrayList]@()
-
     foreach ($TemplateFileToUpdate in $TemplateFilesToUpdate) {
-        $ModuleVersion = Get-NewModuleVersion -TemplateFilePath $TemplateFileToUpdate.FullName
+        $ModuleVersion = Get-NewModuleVersion -TemplateFilePath $TemplateFileToUpdate.FullName -Verbose
         $ModulesToUpdate += @{
-            Version      = $ModuleVersion
+            Version          = $ModuleVersion
             TemplateFilePath = $TemplateFileToUpdate.FullName
         }
 
-        $ParentTemplateFilesToUpdate = Get-ParentModuleTemplateFile -TemplateFilePath $_.FullName -Recurse
+        $ParentTemplateFilesToUpdate = Get-ParentModuleTemplateFile -TemplateFilePath $TemplateFileToUpdate.FullName -Recurse
+        Write-Verbose "Found [$($ParentTemplateFilesToUpdate.count)] parent template files to update"
         foreach ($ParentTemplateFileToUpdate in $ParentTemplateFilesToUpdate) {
             $ParentModuleVersion = Get-NewModuleVersion -TemplateFilePath $ParentTemplateFileToUpdate.FullName
 
             $ModulesToUpdate += @{
-                Version      = $ParentModuleVersion
+                Version          = $ParentModuleVersion
                 TemplateFilePath = $ParentTemplateFileToUpdate.FullName
             }
         }
     }
 
-    $ModulesToUpdate = $ModulesToUpdate | Sort-Object 'TemplateFilePath' -Descending -Unique
+    $ModulesToUpdate = $ModulesToUpdate | Sort-Object TemplateFilePath -Descending -Unique
 
+    Write-Verbose 'Update the following modules:'
     $ModulesToUpdate | ForEach-Object {
-        Write-Verbose ('Update module: [{0}] [{1}] ' -f $_.TemplateFilePath, $_.Version)
+        Write-Verbose (' - [{0}] [{1}] ' -f $_.Version, $_.TemplateFilePath)
     }
 
     return $ModulesToUpdate

From 00a955ffa78167de0b20d16d5f273748b5bbae5e Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Thu, 9 Dec 2021 01:02:47 +0100
Subject: [PATCH 024/121] Update workflow files for all modules

---
 .../workflows/ms.analysisservices.servers.yml | 22 +++++--------------
 .../workflows/ms.apimanagement.service.yml    | 22 +++++--------------
 .../ms.authorization.policyassignments.yml    | 22 +++++--------------
 .../ms.authorization.policydefinitions.yml    | 22 +++++--------------
 .../ms.authorization.policyexemptions.yml     | 22 +++++--------------
 .../ms.authorization.policysetdefinitions.yml | 22 +++++--------------
 .../ms.authorization.roleassignments.yml      | 22 +++++--------------
 .../ms.authorization.roledefinitions.yml      | 22 +++++--------------
 .github/workflows/ms.automanage.accounts.yml  | 22 +++++--------------
 .../ms.automation.automationaccounts.yml      | 22 +++++--------------
 .github/workflows/ms.batch.batchaccounts.yml  | 22 +++++--------------
 .../ms.cognitiveservices.accounts.yml         | 22 +++++--------------
 .../workflows/ms.compute.availabilitysets.yml | 22 +++++--------------
 .../ms.compute.diskencryptionsets.yml         | 22 +++++--------------
 .github/workflows/ms.compute.galleries.yml    | 22 +++++--------------
 .github/workflows/ms.compute.images.yml       | 22 +++++--------------
 .../ms.compute.proximityplacementgroups.yml   | 22 +++++--------------
 .../workflows/ms.compute.virtualmachines.yml  | 22 +++++--------------
 .../ms.compute.virtualmachinescalesets.yml    | 22 +++++--------------
 .github/workflows/ms.consumption.budgets.yml  | 22 +++++--------------
 .../ms.containerinstance.containergroups.yml  | 22 +++++--------------
 .../ms.containerregistry.registries.yml       | 22 +++++--------------
 .../ms.containerservice.managedclusters.yml   | 22 +++++--------------
 .../workflows/ms.databricks.workspaces.yml    | 22 +++++--------------
 .../workflows/ms.datafactory.factories.yml    | 22 +++++--------------
 ...esktopvirtualization.applicationgroups.yml | 22 +++++--------------
 .../ms.desktopvirtualization.hostpools.yml    | 22 +++++--------------
 .../ms.desktopvirtualization.workspaces.yml   | 22 +++++--------------
 .../ms.documentdb.databaseaccounts.yml        | 22 +++++--------------
 .github/workflows/ms.eventgrid.topics.yml     | 22 +++++--------------
 .github/workflows/ms.eventhub.namespaces.yml  | 22 +++++--------------
 .github/workflows/ms.healthbot.healthbots.yml | 22 +++++--------------
 .../workflows/ms.insights.actiongroups.yml    | 22 +++++--------------
 .../ms.insights.activitylogalerts.yml         | 22 +++++--------------
 .github/workflows/ms.insights.components.yml  | 22 +++++--------------
 .../ms.insights.diagnosticsettings.yml        | 22 +++++--------------
 .../workflows/ms.insights.metricalerts.yml    | 22 +++++--------------
 .../ms.insights.privatelinkscopes.yml         | 22 +++++--------------
 .../ms.insights.scheduledqueryrules.yml       | 22 +++++--------------
 .github/workflows/ms.keyvault.vaults.yml      | 22 +++++--------------
 .github/workflows/ms.logic.workflows.yml      | 22 +++++--------------
 .../ms.machinelearningservices.workspaces.yml | 22 +++++--------------
 ...managedidentity.userassignedidentities.yml | 22 +++++--------------
 ...anagedservices.registrationdefinitions.yml | 22 +++++--------------
 .../ms.management.managementgroups.yml        | 22 +++++--------------
 .../workflows/ms.netapp.netappaccounts.yml    | 22 +++++--------------
 .../ms.network.applicationgateways.yml        | 22 +++++--------------
 .../ms.network.applicationsecuritygroups.yml  | 22 +++++--------------
 .../workflows/ms.network.azurefirewalls.yml   | 22 +++++--------------
 .github/workflows/ms.network.bastionhosts.yml | 22 +++++--------------
 .github/workflows/ms.network.connections.yml  | 22 +++++--------------
 .../ms.network.ddosprotectionplans.yml        | 22 +++++--------------
 .../ms.network.expressroutecircuits.yml       | 22 +++++--------------
 .github/workflows/ms.network.ipgroups.yml     | 22 +++++--------------
 .../workflows/ms.network.loadbalancers.yml    | 22 +++++--------------
 .../ms.network.localnetworkgateways.yml       | 22 +++++--------------
 .github/workflows/ms.network.natgateways.yml  | 22 +++++--------------
 .../ms.network.networksecuritygroups.yml      | 22 +++++--------------
 .../workflows/ms.network.networkwatchers.yml  | 22 +++++--------------
 .../workflows/ms.network.privatednszones.yml  | 22 +++++--------------
 .../workflows/ms.network.privateendpoints.yml | 22 +++++--------------
 .../ms.network.publicipaddresses.yml          | 22 +++++--------------
 .../workflows/ms.network.publicipprefixes.yml | 22 +++++--------------
 .github/workflows/ms.network.routetables.yml  | 22 +++++--------------
 .../ms.network.trafficmanagerprofiles.yml     | 22 +++++--------------
 .../ms.network.virtualnetworkgateways.yml     | 22 +++++--------------
 .../workflows/ms.network.virtualnetworks.yml  | 22 +++++--------------
 .github/workflows/ms.network.virtualwans.yml  | 22 +++++--------------
 .../ms.operationalinsights.workspaces.yml     | 22 +++++--------------
 .../workflows/ms.recoveryservices.vaults.yml  | 22 +++++--------------
 .../ms.resources.deploymentscripts.yml        | 22 +++++--------------
 .../workflows/ms.resources.resourcegroups.yml | 22 +++++--------------
 .../ms.security.azuresecuritycenter.yml       | 22 +++++--------------
 .../workflows/ms.servicebus.namespaces.yml    | 22 +++++--------------
 .github/workflows/ms.sql.managedinstances.yml | 22 +++++--------------
 .github/workflows/ms.sql.servers.yml          | 22 +++++--------------
 ...ms.virtualmachineimages.imagetemplates.yml | 22 +++++--------------
 .github/workflows/ms.web.connections.yml      | 22 +++++--------------
 .../workflows/ms.web.hostingenvironments.yml  | 22 +++++--------------
 .github/workflows/ms.web.serverfarms.yml      | 22 +++++--------------
 .github/workflows/ms.web.sites.yml            | 22 +++++--------------
 81 files changed, 405 insertions(+), 1377 deletions(-)

diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
index a0b3e71f09..ef64090436 100644
--- a/.github/workflows/ms.analysisservices.servers.yml
+++ b/.github/workflows/ms.analysisservices.servers.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.apimanagement.service.yml b/.github/workflows/ms.apimanagement.service.yml
index 6366bc82a2..197131a99a 100644
--- a/.github/workflows/ms.apimanagement.service.yml
+++ b/.github/workflows/ms.apimanagement.service.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Soft-delete prevents re-deployment
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.policyassignments.yml b/.github/workflows/ms.authorization.policyassignments.yml
index 07b6d86087..b92ae05100 100644
--- a/.github/workflows/ms.authorization.policyassignments.yml
+++ b/.github/workflows/ms.authorization.policyassignments.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.policydefinitions.yml b/.github/workflows/ms.authorization.policydefinitions.yml
index 4a20a57746..88ec6be732 100644
--- a/.github/workflows/ms.authorization.policydefinitions.yml
+++ b/.github/workflows/ms.authorization.policydefinitions.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.policyexemptions.yml b/.github/workflows/ms.authorization.policyexemptions.yml
index 8c1627c9cc..afc1cb9abd 100644
--- a/.github/workflows/ms.authorization.policyexemptions.yml
+++ b/.github/workflows/ms.authorization.policyexemptions.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.policysetdefinitions.yml b/.github/workflows/ms.authorization.policysetdefinitions.yml
index 6b4e2787be..b9b29611a4 100644
--- a/.github/workflows/ms.authorization.policysetdefinitions.yml
+++ b/.github/workflows/ms.authorization.policysetdefinitions.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.roleassignments.yml b/.github/workflows/ms.authorization.roleassignments.yml
index 518eb5111b..c40f23f3dd 100644
--- a/.github/workflows/ms.authorization.roleassignments.yml
+++ b/.github/workflows/ms.authorization.roleassignments.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml
index 56ea61d19d..65dc5bd07f 100644
--- a/.github/workflows/ms.authorization.roledefinitions.yml
+++ b/.github/workflows/ms.authorization.roledefinitions.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.automanage.accounts.yml b/.github/workflows/ms.automanage.accounts.yml
index 95654ea582..88a85e28d9 100644
--- a/.github/workflows/ms.automanage.accounts.yml
+++ b/.github/workflows/ms.automanage.accounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.automation.automationaccounts.yml b/.github/workflows/ms.automation.automationaccounts.yml
index 85345f9e46..e3a17dbe43 100644
--- a/.github/workflows/ms.automation.automationaccounts.yml
+++ b/.github/workflows/ms.automation.automationaccounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
 
   push:
     branches:
@@ -59,8 +51,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -151,7 +141,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -170,8 +160,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.batch.batchaccounts.yml b/.github/workflows/ms.batch.batchaccounts.yml
index f357edffc4..d1df54b710 100644
--- a/.github/workflows/ms.batch.batchaccounts.yml
+++ b/.github/workflows/ms.batch.batchaccounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.cognitiveservices.accounts.yml b/.github/workflows/ms.cognitiveservices.accounts.yml
index d7c5b77ea5..21749c73e0 100644
--- a/.github/workflows/ms.cognitiveservices.accounts.yml
+++ b/.github/workflows/ms.cognitiveservices.accounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Soft-delete prevents re-deployment
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.availabilitysets.yml b/.github/workflows/ms.compute.availabilitysets.yml
index 6f5c679882..b0d6b1b5b4 100644
--- a/.github/workflows/ms.compute.availabilitysets.yml
+++ b/.github/workflows/ms.compute.availabilitysets.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.diskencryptionsets.yml b/.github/workflows/ms.compute.diskencryptionsets.yml
index 63f77969e3..6cd9ae4032 100644
--- a/.github/workflows/ms.compute.diskencryptionsets.yml
+++ b/.github/workflows/ms.compute.diskencryptionsets.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.galleries.yml b/.github/workflows/ms.compute.galleries.yml
index fe18f38eb2..3157ac26a5 100644
--- a/.github/workflows/ms.compute.galleries.yml
+++ b/.github/workflows/ms.compute.galleries.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.images.yml b/.github/workflows/ms.compute.images.yml
index d0cfb57c88..bd95bb037c 100644
--- a/.github/workflows/ms.compute.images.yml
+++ b/.github/workflows/ms.compute.images.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.proximityplacementgroups.yml b/.github/workflows/ms.compute.proximityplacementgroups.yml
index e4bf3eea31..37e01f173f 100644
--- a/.github/workflows/ms.compute.proximityplacementgroups.yml
+++ b/.github/workflows/ms.compute.proximityplacementgroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.virtualmachines.yml b/.github/workflows/ms.compute.virtualmachines.yml
index 76b317fdc9..24711bb643 100644
--- a/.github/workflows/ms.compute.virtualmachines.yml
+++ b/.github/workflows/ms.compute.virtualmachines.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -156,7 +146,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -175,8 +165,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.compute.virtualmachinescalesets.yml b/.github/workflows/ms.compute.virtualmachinescalesets.yml
index 52be9e49bd..09bf651348 100644
--- a/.github/workflows/ms.compute.virtualmachinescalesets.yml
+++ b/.github/workflows/ms.compute.virtualmachinescalesets.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -156,7 +146,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -175,8 +165,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.consumption.budgets.yml b/.github/workflows/ms.consumption.budgets.yml
index f433cabf8f..cdf4293f52 100644
--- a/.github/workflows/ms.consumption.budgets.yml
+++ b/.github/workflows/ms.consumption.budgets.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Deployment does not support tags
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.containerinstance.containergroups.yml b/.github/workflows/ms.containerinstance.containergroups.yml
index d2de128599..e4c02a99e8 100644
--- a/.github/workflows/ms.containerinstance.containergroups.yml
+++ b/.github/workflows/ms.containerinstance.containergroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.containerregistry.registries.yml b/.github/workflows/ms.containerregistry.registries.yml
index 4d4687ce7e..7b0052760e 100644
--- a/.github/workflows/ms.containerregistry.registries.yml
+++ b/.github/workflows/ms.containerregistry.registries.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.containerservice.managedclusters.yml b/.github/workflows/ms.containerservice.managedclusters.yml
index 828052a643..d98a5c1f09 100644
--- a/.github/workflows/ms.containerservice.managedclusters.yml
+++ b/.github/workflows/ms.containerservice.managedclusters.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.databricks.workspaces.yml b/.github/workflows/ms.databricks.workspaces.yml
index 80af2c0202..7469b1c89b 100644
--- a/.github/workflows/ms.databricks.workspaces.yml
+++ b/.github/workflows/ms.databricks.workspaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.datafactory.factories.yml b/.github/workflows/ms.datafactory.factories.yml
index 3348954a7d..5e97e8305b 100644
--- a/.github/workflows/ms.datafactory.factories.yml
+++ b/.github/workflows/ms.datafactory.factories.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
index 145c485070..4dd6248306 100644
--- a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
+++ b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml
index 26be5d578e..d6f8224c4f 100644
--- a/.github/workflows/ms.desktopvirtualization.hostpools.yml
+++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.desktopvirtualization.workspaces.yml b/.github/workflows/ms.desktopvirtualization.workspaces.yml
index bf77c58701..4b515054c3 100644
--- a/.github/workflows/ms.desktopvirtualization.workspaces.yml
+++ b/.github/workflows/ms.desktopvirtualization.workspaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.documentdb.databaseaccounts.yml b/.github/workflows/ms.documentdb.databaseaccounts.yml
index 4012687b69..25fbdb8708 100644
--- a/.github/workflows/ms.documentdb.databaseaccounts.yml
+++ b/.github/workflows/ms.documentdb.databaseaccounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -155,7 +145,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -174,8 +164,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.eventgrid.topics.yml b/.github/workflows/ms.eventgrid.topics.yml
index 07640ccba7..1130949ded 100644
--- a/.github/workflows/ms.eventgrid.topics.yml
+++ b/.github/workflows/ms.eventgrid.topics.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.eventhub.namespaces.yml b/.github/workflows/ms.eventhub.namespaces.yml
index d6d1ed36c5..c031c6fedc 100644
--- a/.github/workflows/ms.eventhub.namespaces.yml
+++ b/.github/workflows/ms.eventhub.namespaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.healthbot.healthbots.yml b/.github/workflows/ms.healthbot.healthbots.yml
index 3028267f10..22162bb0bd 100644
--- a/.github/workflows/ms.healthbot.healthbots.yml
+++ b/.github/workflows/ms.healthbot.healthbots.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.actiongroups.yml b/.github/workflows/ms.insights.actiongroups.yml
index 588872b770..7bb3ce4703 100644
--- a/.github/workflows/ms.insights.actiongroups.yml
+++ b/.github/workflows/ms.insights.actiongroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.activitylogalerts.yml b/.github/workflows/ms.insights.activitylogalerts.yml
index cf5b5ab9a5..dd14bb07da 100644
--- a/.github/workflows/ms.insights.activitylogalerts.yml
+++ b/.github/workflows/ms.insights.activitylogalerts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.components.yml b/.github/workflows/ms.insights.components.yml
index 364a53a8dc..17d86927b5 100644
--- a/.github/workflows/ms.insights.components.yml
+++ b/.github/workflows/ms.insights.components.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.diagnosticsettings.yml b/.github/workflows/ms.insights.diagnosticsettings.yml
index d20c9870e8..b6eb9aca6b 100644
--- a/.github/workflows/ms.insights.diagnosticsettings.yml
+++ b/.github/workflows/ms.insights.diagnosticsettings.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Needs custom removals script
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.metricalerts.yml b/.github/workflows/ms.insights.metricalerts.yml
index 596f22e6f9..7195af2434 100644
--- a/.github/workflows/ms.insights.metricalerts.yml
+++ b/.github/workflows/ms.insights.metricalerts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.privatelinkscopes.yml b/.github/workflows/ms.insights.privatelinkscopes.yml
index 73e1fb01b3..29f4d46412 100644
--- a/.github/workflows/ms.insights.privatelinkscopes.yml
+++ b/.github/workflows/ms.insights.privatelinkscopes.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.insights.scheduledqueryrules.yml b/.github/workflows/ms.insights.scheduledqueryrules.yml
index 423ce053e3..4987839f4c 100644
--- a/.github/workflows/ms.insights.scheduledqueryrules.yml
+++ b/.github/workflows/ms.insights.scheduledqueryrules.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.keyvault.vaults.yml b/.github/workflows/ms.keyvault.vaults.yml
index 6eb330bda5..874eac4b7e 100644
--- a/.github/workflows/ms.keyvault.vaults.yml
+++ b/.github/workflows/ms.keyvault.vaults.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Soft-delete prevents re-deployment
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.logic.workflows.yml b/.github/workflows/ms.logic.workflows.yml
index 230eb92962..430ee09502 100644
--- a/.github/workflows/ms.logic.workflows.yml
+++ b/.github/workflows/ms.logic.workflows.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.machinelearningservices.workspaces.yml b/.github/workflows/ms.machinelearningservices.workspaces.yml
index 9fec486c6d..90cf95b169 100644
--- a/.github/workflows/ms.machinelearningservices.workspaces.yml
+++ b/.github/workflows/ms.machinelearningservices.workspaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.managedidentity.userassignedidentities.yml b/.github/workflows/ms.managedidentity.userassignedidentities.yml
index 0a0b691a56..06086814a9 100644
--- a/.github/workflows/ms.managedidentity.userassignedidentities.yml
+++ b/.github/workflows/ms.managedidentity.userassignedidentities.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.managedservices.registrationdefinitions.yml b/.github/workflows/ms.managedservices.registrationdefinitions.yml
index b2e4057a4b..d921e9eb8b 100644
--- a/.github/workflows/ms.managedservices.registrationdefinitions.yml
+++ b/.github/workflows/ms.managedservices.registrationdefinitions.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Needs a custom removal script
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.management.managementgroups.yml b/.github/workflows/ms.management.managementgroups.yml
index 14976418b5..18bbe2306b 100644
--- a/.github/workflows/ms.management.managementgroups.yml
+++ b/.github/workflows/ms.management.managementgroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Deployment does not support tags
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.netapp.netappaccounts.yml b/.github/workflows/ms.netapp.netappaccounts.yml
index a3b4858950..65c90785bb 100644
--- a/.github/workflows/ms.netapp.netappaccounts.yml
+++ b/.github/workflows/ms.netapp.netappaccounts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -155,7 +145,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -174,8 +164,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.applicationgateways.yml b/.github/workflows/ms.network.applicationgateways.yml
index 9f4fc4ac69..3e64e82938 100644
--- a/.github/workflows/ms.network.applicationgateways.yml
+++ b/.github/workflows/ms.network.applicationgateways.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.applicationsecuritygroups.yml b/.github/workflows/ms.network.applicationsecuritygroups.yml
index 640e3b7b1c..1d9d80862a 100644
--- a/.github/workflows/ms.network.applicationsecuritygroups.yml
+++ b/.github/workflows/ms.network.applicationsecuritygroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.azurefirewalls.yml b/.github/workflows/ms.network.azurefirewalls.yml
index e87dc0d3af..dab561733e 100644
--- a/.github/workflows/ms.network.azurefirewalls.yml
+++ b/.github/workflows/ms.network.azurefirewalls.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.bastionhosts.yml b/.github/workflows/ms.network.bastionhosts.yml
index 985e8258df..1a5ee70f7c 100644
--- a/.github/workflows/ms.network.bastionhosts.yml
+++ b/.github/workflows/ms.network.bastionhosts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.connections.yml b/.github/workflows/ms.network.connections.yml
index e9996ea6f7..3e1585ca96 100644
--- a/.github/workflows/ms.network.connections.yml
+++ b/.github/workflows/ms.network.connections.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.ddosprotectionplans.yml b/.github/workflows/ms.network.ddosprotectionplans.yml
index b43388b89c..6edba9118a 100644
--- a/.github/workflows/ms.network.ddosprotectionplans.yml
+++ b/.github/workflows/ms.network.ddosprotectionplans.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.expressroutecircuits.yml b/.github/workflows/ms.network.expressroutecircuits.yml
index 537586d11e..296adb03e5 100644
--- a/.github/workflows/ms.network.expressroutecircuits.yml
+++ b/.github/workflows/ms.network.expressroutecircuits.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.ipgroups.yml b/.github/workflows/ms.network.ipgroups.yml
index d4ee06ac2c..f0a1dd42a8 100644
--- a/.github/workflows/ms.network.ipgroups.yml
+++ b/.github/workflows/ms.network.ipgroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.loadbalancers.yml b/.github/workflows/ms.network.loadbalancers.yml
index 820331315d..18a08ed23a 100644
--- a/.github/workflows/ms.network.loadbalancers.yml
+++ b/.github/workflows/ms.network.loadbalancers.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.localnetworkgateways.yml b/.github/workflows/ms.network.localnetworkgateways.yml
index 0344fce30e..b728113339 100644
--- a/.github/workflows/ms.network.localnetworkgateways.yml
+++ b/.github/workflows/ms.network.localnetworkgateways.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.natgateways.yml b/.github/workflows/ms.network.natgateways.yml
index b21e1f0be6..9410311f9c 100644
--- a/.github/workflows/ms.network.natgateways.yml
+++ b/.github/workflows/ms.network.natgateways.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.networksecuritygroups.yml b/.github/workflows/ms.network.networksecuritygroups.yml
index b69795137a..347c183c0a 100644
--- a/.github/workflows/ms.network.networksecuritygroups.yml
+++ b/.github/workflows/ms.network.networksecuritygroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.networkwatchers.yml b/.github/workflows/ms.network.networkwatchers.yml
index 3b9a31e93a..3920c05af5 100644
--- a/.github/workflows/ms.network.networkwatchers.yml
+++ b/.github/workflows/ms.network.networkwatchers.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Required as a dependency + Only one Network Watcher can exist in the same location. If removed, a default would be created in a dedicated RG
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.privatednszones.yml b/.github/workflows/ms.network.privatednszones.yml
index e98c77b347..ee4360c416 100644
--- a/.github/workflows/ms.network.privatednszones.yml
+++ b/.github/workflows/ms.network.privatednszones.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.privateendpoints.yml b/.github/workflows/ms.network.privateendpoints.yml
index a7477c6b2d..6273a9278e 100644
--- a/.github/workflows/ms.network.privateendpoints.yml
+++ b/.github/workflows/ms.network.privateendpoints.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.publicipaddresses.yml b/.github/workflows/ms.network.publicipaddresses.yml
index 7b1a151d9c..9e99ff96a4 100644
--- a/.github/workflows/ms.network.publicipaddresses.yml
+++ b/.github/workflows/ms.network.publicipaddresses.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.publicipprefixes.yml b/.github/workflows/ms.network.publicipprefixes.yml
index 978eeef4dc..fbaff25ef8 100644
--- a/.github/workflows/ms.network.publicipprefixes.yml
+++ b/.github/workflows/ms.network.publicipprefixes.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.routetables.yml b/.github/workflows/ms.network.routetables.yml
index 6999aa2ebc..130096bc01 100644
--- a/.github/workflows/ms.network.routetables.yml
+++ b/.github/workflows/ms.network.routetables.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.trafficmanagerprofiles.yml b/.github/workflows/ms.network.trafficmanagerprofiles.yml
index c22dadc7d1..5b36ffd36a 100644
--- a/.github/workflows/ms.network.trafficmanagerprofiles.yml
+++ b/.github/workflows/ms.network.trafficmanagerprofiles.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.virtualnetworkgateways.yml b/.github/workflows/ms.network.virtualnetworkgateways.yml
index ad29cf823c..7965e72890 100644
--- a/.github/workflows/ms.network.virtualnetworkgateways.yml
+++ b/.github/workflows/ms.network.virtualnetworkgateways.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -151,7 +141,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -170,8 +160,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.virtualnetworks.yml b/.github/workflows/ms.network.virtualnetworks.yml
index 303781bb26..f68faedc54 100644
--- a/.github/workflows/ms.network.virtualnetworks.yml
+++ b/.github/workflows/ms.network.virtualnetworks.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.network.virtualwans.yml b/.github/workflows/ms.network.virtualwans.yml
index 4b04e9fb36..efd9630398 100644
--- a/.github/workflows/ms.network.virtualwans.yml
+++ b/.github/workflows/ms.network.virtualwans.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.operationalinsights.workspaces.yml b/.github/workflows/ms.operationalinsights.workspaces.yml
index b9bd03ab4a..1fe73477ca 100644
--- a/.github/workflows/ms.operationalinsights.workspaces.yml
+++ b/.github/workflows/ms.operationalinsights.workspaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.recoveryservices.vaults.yml b/.github/workflows/ms.recoveryservices.vaults.yml
index 44343c4f90..91cc41f9eb 100644
--- a/.github/workflows/ms.recoveryservices.vaults.yml
+++ b/.github/workflows/ms.recoveryservices.vaults.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.resources.deploymentscripts.yml b/.github/workflows/ms.resources.deploymentscripts.yml
index 576f84cc05..6ed5abb07f 100644
--- a/.github/workflows/ms.resources.deploymentscripts.yml
+++ b/.github/workflows/ms.resources.deploymentscripts.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.resources.resourcegroups.yml b/.github/workflows/ms.resources.resourcegroups.yml
index d26577eb35..f472fb48d3 100644
--- a/.github/workflows/ms.resources.resourcegroups.yml
+++ b/.github/workflows/ms.resources.resourcegroups.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.security.azuresecuritycenter.yml b/.github/workflows/ms.security.azuresecuritycenter.yml
index a6f89bbcbc..2ad973aae7 100644
--- a/.github/workflows/ms.security.azuresecuritycenter.yml
+++ b/.github/workflows/ms.security.azuresecuritycenter.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'false' # Needs custom removals script
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.servicebus.namespaces.yml b/.github/workflows/ms.servicebus.namespaces.yml
index d0f2e192ef..66cfeef4b1 100644
--- a/.github/workflows/ms.servicebus.namespaces.yml
+++ b/.github/workflows/ms.servicebus.namespaces.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.sql.managedinstances.yml b/.github/workflows/ms.sql.managedinstances.yml
index a80eb253ef..7e56acd99b 100644
--- a/.github/workflows/ms.sql.managedinstances.yml
+++ b/.github/workflows/ms.sql.managedinstances.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.sql.servers.yml b/.github/workflows/ms.sql.servers.yml
index e996b166ce..dc7616b879 100644
--- a/.github/workflows/ms.sql.servers.yml
+++ b/.github/workflows/ms.sql.servers.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
index 300c63c9d3..6eb772dcd5 100644
--- a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
+++ b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.web.connections.yml b/.github/workflows/ms.web.connections.yml
index 0abc6be047..e955d4ff6a 100644
--- a/.github/workflows/ms.web.connections.yml
+++ b/.github/workflows/ms.web.connections.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.web.hostingenvironments.yml b/.github/workflows/ms.web.hostingenvironments.yml
index b71dc8a634..39e9de5148 100644
--- a/.github/workflows/ms.web.hostingenvironments.yml
+++ b/.github/workflows/ms.web.hostingenvironments.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.web.serverfarms.yml b/.github/workflows/ms.web.serverfarms.yml
index 89473a05eb..cd2c7a82cc 100644
--- a/.github/workflows/ms.web.serverfarms.yml
+++ b/.github/workflows/ms.web.serverfarms.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -150,7 +140,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -169,8 +159,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.web.sites.yml b/.github/workflows/ms.web.sites.yml
index 6bf6d0bde5..1b59aa432e 100644
--- a/.github/workflows/ms.web.sites.yml
+++ b/.github/workflows/ms.web.sites.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -58,8 +50,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ##################
   #   UNIT TESTS   #
@@ -156,7 +146,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
@@ -175,8 +165,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'

From 508b14f56a545d1bcb28ff66af7d084ebb9e3a13 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Thu, 9 Dec 2021 01:03:10 +0100
Subject: [PATCH 025/121] Added version files for all modules, setting 0.3
 version

---
 arm/Microsoft.AnalysisServices/servers/version.json           | 4 ++++
 .../service/apiVersionSets/version.json                       | 4 ++++
 .../service/apis/policies/version.json                        | 4 ++++
 arm/Microsoft.ApiManagement/service/apis/version.json         | 4 ++++
 .../service/authorizationServers/version.json                 | 4 ++++
 arm/Microsoft.ApiManagement/service/backends/version.json     | 4 ++++
 arm/Microsoft.ApiManagement/service/caches/version.json       | 4 ++++
 .../service/identityProviders/version.json                    | 4 ++++
 arm/Microsoft.ApiManagement/service/namedValues/version.json  | 4 ++++
 arm/Microsoft.ApiManagement/service/policies/version.json     | 4 ++++
 .../service/portalsettings/version.json                       | 4 ++++
 .../service/products/apis/version.json                        | 4 ++++
 .../service/products/groups/version.json                      | 4 ++++
 arm/Microsoft.ApiManagement/service/products/version.json     | 4 ++++
 .../service/subscriptions/version.json                        | 4 ++++
 arm/Microsoft.ApiManagement/service/version.json              | 4 ++++
 arm/Microsoft.Authorization/policyAssignments/version.json    | 4 ++++
 arm/Microsoft.Authorization/policyDefinitions/version.json    | 4 ++++
 arm/Microsoft.Authorization/policyExemptions/version.json     | 4 ++++
 arm/Microsoft.Authorization/policySetDefinitions/version.json | 4 ++++
 arm/Microsoft.Authorization/roleAssignments/version.json      | 4 ++++
 arm/Microsoft.Authorization/roleDefinitions/version.json      | 4 ++++
 arm/Microsoft.Automanage/accounts/version.json                | 4 ++++
 .../automationAccounts/jobSchedules/version.json              | 4 ++++
 .../automationAccounts/modules/version.json                   | 4 ++++
 .../automationAccounts/runbooks/version.json                  | 4 ++++
 .../automationAccounts/schedules/version.json                 | 4 ++++
 .../softwareUpdateConfigurations/version.json                 | 4 ++++
 .../automationAccounts/variables/version.json                 | 4 ++++
 arm/Microsoft.Automation/automationAccounts/version.json      | 4 ++++
 arm/Microsoft.Batch/batchAccounts/version.json                | 4 ++++
 arm/Microsoft.CognitiveServices/accounts/version.json         | 4 ++++
 arm/Microsoft.Compute/availabilitySets/version.json           | 4 ++++
 arm/Microsoft.Compute/diskEncryptionSets/version.json         | 4 ++++
 arm/Microsoft.Compute/galleries/images/version.json           | 4 ++++
 arm/Microsoft.Compute/galleries/version.json                  | 4 ++++
 arm/Microsoft.Compute/images/version.json                     | 4 ++++
 arm/Microsoft.Compute/proximityPlacementGroups/version.json   | 4 ++++
 .../virtualMachineScaleSets/extensions/version.json           | 4 ++++
 arm/Microsoft.Compute/virtualMachineScaleSets/version.json    | 4 ++++
 arm/Microsoft.Compute/virtualMachines/extensions/version.json | 4 ++++
 arm/Microsoft.Compute/virtualMachines/version.json            | 4 ++++
 arm/Microsoft.Consumption/budgets/version.json                | 4 ++++
 arm/Microsoft.ContainerInstance/containerGroups/version.json  | 4 ++++
 arm/Microsoft.ContainerRegistry/registries/version.json       | 4 ++++
 .../managedClusters/agentPools/version.json                   | 4 ++++
 arm/Microsoft.ContainerService/managedClusters/version.json   | 4 ++++
 .../factories/integrationRuntime/version.json                 | 4 ++++
 .../factories/managedVirtualNetwork/version.json              | 4 ++++
 arm/Microsoft.DataFactory/factories/version.json              | 4 ++++
 arm/Microsoft.Databricks/workspaces/version.json              | 4 ++++
 .../applicationgroups/applications/version.json               | 4 ++++
 .../applicationgroups/version.json                            | 4 ++++
 arm/Microsoft.DesktopVirtualization/hostpools/version.json    | 4 ++++
 arm/Microsoft.DesktopVirtualization/workspaces/version.json   | 4 ++++
 .../mongodbDatabases/collections/version.json                 | 4 ++++
 .../databaseAccounts/mongodbDatabases/version.json            | 4 ++++
 .../databaseAccounts/sqlDatabases/containers/version.json     | 4 ++++
 .../databaseAccounts/sqlDatabases/version.json                | 4 ++++
 arm/Microsoft.DocumentDB/databaseAccounts/version.json        | 4 ++++
 arm/Microsoft.EventGrid/topics/version.json                   | 4 ++++
 .../namespaces/authorizationRules/version.json                | 4 ++++
 .../namespaces/disasterRecoveryConfigs/version.json           | 4 ++++
 .../namespaces/eventhubs/authorizationRules/version.json      | 4 ++++
 .../namespaces/eventhubs/consumergroups/version.json          | 4 ++++
 arm/Microsoft.EventHub/namespaces/eventhubs/version.json      | 4 ++++
 arm/Microsoft.EventHub/namespaces/version.json                | 4 ++++
 arm/Microsoft.HealthBot/healthBots/version.json               | 4 ++++
 arm/Microsoft.Insights/actionGroups/version.json              | 4 ++++
 arm/Microsoft.Insights/activityLogAlerts/version.json         | 4 ++++
 arm/Microsoft.Insights/components/version.json                | 4 ++++
 arm/Microsoft.Insights/diagnosticSettings/version.json        | 4 ++++
 arm/Microsoft.Insights/metricAlerts/version.json              | 4 ++++
 .../privateLinkScopes/scopedResources/version.json            | 4 ++++
 arm/Microsoft.Insights/privateLinkScopes/version.json         | 4 ++++
 arm/Microsoft.Insights/scheduledQueryRules/version.json       | 4 ++++
 arm/Microsoft.KeyVault/vaults/accessPolicies/version.json     | 4 ++++
 arm/Microsoft.KeyVault/vaults/keys/version.json               | 4 ++++
 arm/Microsoft.KeyVault/vaults/secrets/version.json            | 4 ++++
 arm/Microsoft.KeyVault/vaults/version.json                    | 4 ++++
 arm/Microsoft.Logic/workflows/version.json                    | 4 ++++
 arm/Microsoft.MachineLearningServices/workspaces/version.json | 4 ++++
 .../userAssignedIdentities/version.json                       | 4 ++++
 .../registrationDefinitions/version.json                      | 4 ++++
 arm/Microsoft.Management/managementGroups/version.json        | 4 ++++
 .../netAppAccounts/capacityPools/version.json                 | 4 ++++
 .../netAppAccounts/capacityPools/volumes/version.json         | 4 ++++
 arm/Microsoft.NetApp/netAppAccounts/version.json              | 4 ++++
 arm/Microsoft.Network/applicationGateways/version.json        | 4 ++++
 arm/Microsoft.Network/applicationSecurityGroups/version.json  | 4 ++++
 arm/Microsoft.Network/azureFirewalls/version.json             | 4 ++++
 arm/Microsoft.Network/bastionHosts/version.json               | 4 ++++
 arm/Microsoft.Network/connections/version.json                | 4 ++++
 arm/Microsoft.Network/ddosProtectionPlans/version.json        | 4 ++++
 arm/Microsoft.Network/expressRouteCircuits/version.json       | 4 ++++
 arm/Microsoft.Network/ipGroups/version.json                   | 4 ++++
 arm/Microsoft.Network/loadBalancers/version.json              | 4 ++++
 arm/Microsoft.Network/localNetworkGateways/version.json       | 4 ++++
 arm/Microsoft.Network/natGateways/version.json                | 4 ++++
 arm/Microsoft.Network/networkSecurityGroups/version.json      | 4 ++++
 .../networkWatchers/connectionMonitors/version.json           | 4 ++++
 arm/Microsoft.Network/networkWatchers/flowLogs/version.json   | 4 ++++
 arm/Microsoft.Network/networkWatchers/version.json            | 4 ++++
 arm/Microsoft.Network/privateDnsZones/version.json            | 4 ++++
 .../privateDnsZones/virtualNetworkLinks/version.json          | 4 ++++
 .../privateEndpoints/privateDnsZoneGroups/version.json        | 4 ++++
 arm/Microsoft.Network/privateEndpoints/version.json           | 4 ++++
 arm/Microsoft.Network/publicIPAddresses/version.json          | 4 ++++
 arm/Microsoft.Network/publicIPPrefixes/version.json           | 4 ++++
 arm/Microsoft.Network/routeTables/version.json                | 4 ++++
 arm/Microsoft.Network/trafficmanagerprofiles/version.json     | 4 ++++
 arm/Microsoft.Network/virtualNetworkGateways/version.json     | 4 ++++
 arm/Microsoft.Network/virtualNetworks/version.json            | 4 ++++
 .../virtualNetworks/virtualNetworkPeerings/version.json       | 4 ++++
 arm/Microsoft.Network/virtualWans/version.json                | 4 ++++
 .../workspaces/dataSources/version.json                       | 4 ++++
 .../workspaces/linkedServices/version.json                    | 4 ++++
 .../workspaces/savedSearches/version.json                     | 4 ++++
 .../workspaces/storageInsightConfigs/version.json             | 4 ++++
 arm/Microsoft.OperationalInsights/workspaces/version.json     | 4 ++++
 .../vaults/backupPolicies/version.json                        | 4 ++++
 .../vaults/backupStorageConfig/version.json                   | 4 ++++
 .../vaults/protectionContainers/version.json                  | 4 ++++
 arm/Microsoft.RecoveryServices/vaults/version.json            | 4 ++++
 arm/Microsoft.Resources/deploymentScripts/version.json        | 4 ++++
 arm/Microsoft.Resources/resourceGroups/version.json           | 4 ++++
 arm/Microsoft.Security/azureSecurityCenter/version.json       | 4 ++++
 .../namespaces/authorizationRules/version.json                | 4 ++++
 .../namespaces/disasterRecoveryConfigs/version.json           | 4 ++++
 .../namespaces/ipFilterRules/version.json                     | 4 ++++
 .../namespaces/migrationConfigurations/version.json           | 4 ++++
 .../namespaces/queues/authorizationRules/version.json         | 4 ++++
 arm/Microsoft.ServiceBus/namespaces/queues/version.json       | 4 ++++
 arm/Microsoft.ServiceBus/namespaces/version.json              | 4 ++++
 .../namespaces/virtualNetworkRules/version.json               | 4 ++++
 .../managedInstances/administrators/version.json              | 4 ++++
 .../databases/backupLongTermRetentionPolicies/version.json    | 4 ++++
 .../databases/backupShortTermRetentionPolicies/version.json   | 4 ++++
 arm/Microsoft.Sql/managedInstances/databases/version.json     | 4 ++++
 .../managedInstances/encryptionProtector/version.json         | 4 ++++
 arm/Microsoft.Sql/managedInstances/keys/version.json          | 4 ++++
 .../managedInstances/securityAlertPolicies/version.json       | 4 ++++
 arm/Microsoft.Sql/managedInstances/version.json               | 4 ++++
 .../managedInstances/vulnerabilityAssessments/version.json    | 4 ++++
 arm/Microsoft.Sql/servers/databases/version.json              | 4 ++++
 arm/Microsoft.Sql/servers/firewallRules/version.json          | 4 ++++
 arm/Microsoft.Sql/servers/securityAlertPolicies/version.json  | 4 ++++
 arm/Microsoft.Sql/servers/version.json                        | 4 ++++
 .../blobServices/containers/immutabilityPolicies/version.json | 4 ++++
 .../storageAccounts/blobServices/containers/version.json      | 4 ++++
 .../storageAccounts/blobServices/version.json                 | 4 ++++
 .../storageAccounts/managementPolicies/version.json           | 4 ++++
 .../storageAccounts/queueServices/queues/version.json         | 4 ++++
 .../storageAccounts/queueServices/version.json                | 4 ++++
 .../imageTemplates/version.json                               | 4 ++++
 arm/Microsoft.Web/connections/version.json                    | 4 ++++
 arm/Microsoft.Web/hostingEnvironments/version.json            | 4 ++++
 arm/Microsoft.Web/serverfarms/version.json                    | 4 ++++
 arm/Microsoft.Web/sites/config/version.json                   | 4 ++++
 arm/Microsoft.Web/sites/version.json                          | 4 ++++
 160 files changed, 640 insertions(+)
 create mode 100644 arm/Microsoft.AnalysisServices/servers/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/apiVersionSets/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/apis/policies/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/apis/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/authorizationServers/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/backends/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/caches/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/identityProviders/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/namedValues/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/policies/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/portalsettings/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/products/apis/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/products/groups/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/products/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/subscriptions/version.json
 create mode 100644 arm/Microsoft.ApiManagement/service/version.json
 create mode 100644 arm/Microsoft.Authorization/policyAssignments/version.json
 create mode 100644 arm/Microsoft.Authorization/policyDefinitions/version.json
 create mode 100644 arm/Microsoft.Authorization/policyExemptions/version.json
 create mode 100644 arm/Microsoft.Authorization/policySetDefinitions/version.json
 create mode 100644 arm/Microsoft.Authorization/roleAssignments/version.json
 create mode 100644 arm/Microsoft.Authorization/roleDefinitions/version.json
 create mode 100644 arm/Microsoft.Automanage/accounts/version.json
 create mode 100644 arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json
 create mode 100644 arm/Microsoft.Automation/automationAccounts/modules/version.json
 create mode 100644 arm/Microsoft.Automation/automationAccounts/runbooks/version.json
 create mode 100644 arm/Microsoft.Automation/automationAccounts/schedules/version.json
 create mode 100644 arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
 create mode 100644 arm/Microsoft.Automation/automationAccounts/variables/version.json
 create mode 100644 arm/Microsoft.Automation/automationAccounts/version.json
 create mode 100644 arm/Microsoft.Batch/batchAccounts/version.json
 create mode 100644 arm/Microsoft.CognitiveServices/accounts/version.json
 create mode 100644 arm/Microsoft.Compute/availabilitySets/version.json
 create mode 100644 arm/Microsoft.Compute/diskEncryptionSets/version.json
 create mode 100644 arm/Microsoft.Compute/galleries/images/version.json
 create mode 100644 arm/Microsoft.Compute/galleries/version.json
 create mode 100644 arm/Microsoft.Compute/images/version.json
 create mode 100644 arm/Microsoft.Compute/proximityPlacementGroups/version.json
 create mode 100644 arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
 create mode 100644 arm/Microsoft.Compute/virtualMachineScaleSets/version.json
 create mode 100644 arm/Microsoft.Compute/virtualMachines/extensions/version.json
 create mode 100644 arm/Microsoft.Compute/virtualMachines/version.json
 create mode 100644 arm/Microsoft.Consumption/budgets/version.json
 create mode 100644 arm/Microsoft.ContainerInstance/containerGroups/version.json
 create mode 100644 arm/Microsoft.ContainerRegistry/registries/version.json
 create mode 100644 arm/Microsoft.ContainerService/managedClusters/agentPools/version.json
 create mode 100644 arm/Microsoft.ContainerService/managedClusters/version.json
 create mode 100644 arm/Microsoft.DataFactory/factories/integrationRuntime/version.json
 create mode 100644 arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
 create mode 100644 arm/Microsoft.DataFactory/factories/version.json
 create mode 100644 arm/Microsoft.Databricks/workspaces/version.json
 create mode 100644 arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
 create mode 100644 arm/Microsoft.DesktopVirtualization/applicationgroups/version.json
 create mode 100644 arm/Microsoft.DesktopVirtualization/hostpools/version.json
 create mode 100644 arm/Microsoft.DesktopVirtualization/workspaces/version.json
 create mode 100644 arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
 create mode 100644 arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
 create mode 100644 arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
 create mode 100644 arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
 create mode 100644 arm/Microsoft.DocumentDB/databaseAccounts/version.json
 create mode 100644 arm/Microsoft.EventGrid/topics/version.json
 create mode 100644 arm/Microsoft.EventHub/namespaces/authorizationRules/version.json
 create mode 100644 arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
 create mode 100644 arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
 create mode 100644 arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
 create mode 100644 arm/Microsoft.EventHub/namespaces/eventhubs/version.json
 create mode 100644 arm/Microsoft.EventHub/namespaces/version.json
 create mode 100644 arm/Microsoft.HealthBot/healthBots/version.json
 create mode 100644 arm/Microsoft.Insights/actionGroups/version.json
 create mode 100644 arm/Microsoft.Insights/activityLogAlerts/version.json
 create mode 100644 arm/Microsoft.Insights/components/version.json
 create mode 100644 arm/Microsoft.Insights/diagnosticSettings/version.json
 create mode 100644 arm/Microsoft.Insights/metricAlerts/version.json
 create mode 100644 arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
 create mode 100644 arm/Microsoft.Insights/privateLinkScopes/version.json
 create mode 100644 arm/Microsoft.Insights/scheduledQueryRules/version.json
 create mode 100644 arm/Microsoft.KeyVault/vaults/accessPolicies/version.json
 create mode 100644 arm/Microsoft.KeyVault/vaults/keys/version.json
 create mode 100644 arm/Microsoft.KeyVault/vaults/secrets/version.json
 create mode 100644 arm/Microsoft.KeyVault/vaults/version.json
 create mode 100644 arm/Microsoft.Logic/workflows/version.json
 create mode 100644 arm/Microsoft.MachineLearningServices/workspaces/version.json
 create mode 100644 arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
 create mode 100644 arm/Microsoft.ManagedServices/registrationDefinitions/version.json
 create mode 100644 arm/Microsoft.Management/managementGroups/version.json
 create mode 100644 arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
 create mode 100644 arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
 create mode 100644 arm/Microsoft.NetApp/netAppAccounts/version.json
 create mode 100644 arm/Microsoft.Network/applicationGateways/version.json
 create mode 100644 arm/Microsoft.Network/applicationSecurityGroups/version.json
 create mode 100644 arm/Microsoft.Network/azureFirewalls/version.json
 create mode 100644 arm/Microsoft.Network/bastionHosts/version.json
 create mode 100644 arm/Microsoft.Network/connections/version.json
 create mode 100644 arm/Microsoft.Network/ddosProtectionPlans/version.json
 create mode 100644 arm/Microsoft.Network/expressRouteCircuits/version.json
 create mode 100644 arm/Microsoft.Network/ipGroups/version.json
 create mode 100644 arm/Microsoft.Network/loadBalancers/version.json
 create mode 100644 arm/Microsoft.Network/localNetworkGateways/version.json
 create mode 100644 arm/Microsoft.Network/natGateways/version.json
 create mode 100644 arm/Microsoft.Network/networkSecurityGroups/version.json
 create mode 100644 arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json
 create mode 100644 arm/Microsoft.Network/networkWatchers/flowLogs/version.json
 create mode 100644 arm/Microsoft.Network/networkWatchers/version.json
 create mode 100644 arm/Microsoft.Network/privateDnsZones/version.json
 create mode 100644 arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
 create mode 100644 arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
 create mode 100644 arm/Microsoft.Network/privateEndpoints/version.json
 create mode 100644 arm/Microsoft.Network/publicIPAddresses/version.json
 create mode 100644 arm/Microsoft.Network/publicIPPrefixes/version.json
 create mode 100644 arm/Microsoft.Network/routeTables/version.json
 create mode 100644 arm/Microsoft.Network/trafficmanagerprofiles/version.json
 create mode 100644 arm/Microsoft.Network/virtualNetworkGateways/version.json
 create mode 100644 arm/Microsoft.Network/virtualNetworks/version.json
 create mode 100644 arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
 create mode 100644 arm/Microsoft.Network/virtualWans/version.json
 create mode 100644 arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json
 create mode 100644 arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
 create mode 100644 arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
 create mode 100644 arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
 create mode 100644 arm/Microsoft.OperationalInsights/workspaces/version.json
 create mode 100644 arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
 create mode 100644 arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
 create mode 100644 arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
 create mode 100644 arm/Microsoft.RecoveryServices/vaults/version.json
 create mode 100644 arm/Microsoft.Resources/deploymentScripts/version.json
 create mode 100644 arm/Microsoft.Resources/resourceGroups/version.json
 create mode 100644 arm/Microsoft.Security/azureSecurityCenter/version.json
 create mode 100644 arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
 create mode 100644 arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
 create mode 100644 arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
 create mode 100644 arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
 create mode 100644 arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
 create mode 100644 arm/Microsoft.ServiceBus/namespaces/queues/version.json
 create mode 100644 arm/Microsoft.ServiceBus/namespaces/version.json
 create mode 100644 arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
 create mode 100644 arm/Microsoft.Sql/managedInstances/administrators/version.json
 create mode 100644 arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
 create mode 100644 arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
 create mode 100644 arm/Microsoft.Sql/managedInstances/databases/version.json
 create mode 100644 arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json
 create mode 100644 arm/Microsoft.Sql/managedInstances/keys/version.json
 create mode 100644 arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
 create mode 100644 arm/Microsoft.Sql/managedInstances/version.json
 create mode 100644 arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
 create mode 100644 arm/Microsoft.Sql/servers/databases/version.json
 create mode 100644 arm/Microsoft.Sql/servers/firewallRules/version.json
 create mode 100644 arm/Microsoft.Sql/servers/securityAlertPolicies/version.json
 create mode 100644 arm/Microsoft.Sql/servers/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/blobServices/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
 create mode 100644 arm/Microsoft.Storage/storageAccounts/queueServices/version.json
 create mode 100644 arm/Microsoft.VirtualMachineImages/imageTemplates/version.json
 create mode 100644 arm/Microsoft.Web/connections/version.json
 create mode 100644 arm/Microsoft.Web/hostingEnvironments/version.json
 create mode 100644 arm/Microsoft.Web/serverfarms/version.json
 create mode 100644 arm/Microsoft.Web/sites/config/version.json
 create mode 100644 arm/Microsoft.Web/sites/version.json

diff --git a/arm/Microsoft.AnalysisServices/servers/version.json b/arm/Microsoft.AnalysisServices/servers/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.AnalysisServices/servers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json b/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/version.json b/arm/Microsoft.ApiManagement/service/apis/policies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/apis/policies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/apis/version.json b/arm/Microsoft.ApiManagement/service/apis/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/apis/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/version.json b/arm/Microsoft.ApiManagement/service/authorizationServers/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/authorizationServers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/backends/version.json b/arm/Microsoft.ApiManagement/service/backends/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/backends/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/caches/version.json b/arm/Microsoft.ApiManagement/service/caches/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/caches/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/version.json b/arm/Microsoft.ApiManagement/service/identityProviders/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/identityProviders/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/version.json b/arm/Microsoft.ApiManagement/service/namedValues/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/namedValues/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/policies/version.json b/arm/Microsoft.ApiManagement/service/policies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/policies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/version.json b/arm/Microsoft.ApiManagement/service/portalsettings/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/portalsettings/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/version.json b/arm/Microsoft.ApiManagement/service/products/apis/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/products/apis/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/version.json b/arm/Microsoft.ApiManagement/service/products/groups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/products/groups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/products/version.json b/arm/Microsoft.ApiManagement/service/products/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/products/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/version.json b/arm/Microsoft.ApiManagement/service/subscriptions/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/subscriptions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ApiManagement/service/version.json b/arm/Microsoft.ApiManagement/service/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ApiManagement/service/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Authorization/policyAssignments/version.json b/arm/Microsoft.Authorization/policyAssignments/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Authorization/policyAssignments/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Authorization/policyDefinitions/version.json b/arm/Microsoft.Authorization/policyDefinitions/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Authorization/policyDefinitions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Authorization/policyExemptions/version.json b/arm/Microsoft.Authorization/policyExemptions/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Authorization/policyExemptions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/version.json b/arm/Microsoft.Authorization/policySetDefinitions/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Authorization/policySetDefinitions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Authorization/roleAssignments/version.json b/arm/Microsoft.Authorization/roleAssignments/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Authorization/roleAssignments/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Authorization/roleDefinitions/version.json b/arm/Microsoft.Authorization/roleDefinitions/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Authorization/roleDefinitions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Automanage/accounts/version.json b/arm/Microsoft.Automanage/accounts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Automanage/accounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json b/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/version.json b/arm/Microsoft.Automation/automationAccounts/modules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/modules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/version.json b/arm/Microsoft.Automation/automationAccounts/runbooks/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/runbooks/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/version.json b/arm/Microsoft.Automation/automationAccounts/schedules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/schedules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/version.json b/arm/Microsoft.Automation/automationAccounts/variables/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/variables/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Automation/automationAccounts/version.json b/arm/Microsoft.Automation/automationAccounts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Automation/automationAccounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Batch/batchAccounts/version.json b/arm/Microsoft.Batch/batchAccounts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Batch/batchAccounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.CognitiveServices/accounts/version.json b/arm/Microsoft.CognitiveServices/accounts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.CognitiveServices/accounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Compute/availabilitySets/version.json b/arm/Microsoft.Compute/availabilitySets/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Compute/availabilitySets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/version.json b/arm/Microsoft.Compute/diskEncryptionSets/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Compute/diskEncryptionSets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Compute/galleries/images/version.json b/arm/Microsoft.Compute/galleries/images/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Compute/galleries/images/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Compute/galleries/version.json b/arm/Microsoft.Compute/galleries/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Compute/galleries/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Compute/images/version.json b/arm/Microsoft.Compute/images/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Compute/images/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/version.json b/arm/Microsoft.Compute/proximityPlacementGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Compute/proximityPlacementGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/version.json b/arm/Microsoft.Compute/virtualMachineScaleSets/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Compute/virtualMachineScaleSets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/version.json b/arm/Microsoft.Compute/virtualMachines/extensions/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Compute/virtualMachines/extensions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Compute/virtualMachines/version.json b/arm/Microsoft.Compute/virtualMachines/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Compute/virtualMachines/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Consumption/budgets/version.json b/arm/Microsoft.Consumption/budgets/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Consumption/budgets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/version.json b/arm/Microsoft.ContainerInstance/containerGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ContainerInstance/containerGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ContainerRegistry/registries/version.json b/arm/Microsoft.ContainerRegistry/registries/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ContainerRegistry/registries/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json b/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ContainerService/managedClusters/version.json b/arm/Microsoft.ContainerService/managedClusters/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ContainerService/managedClusters/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json b/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DataFactory/factories/version.json b/arm/Microsoft.DataFactory/factories/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DataFactory/factories/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Databricks/workspaces/version.json b/arm/Microsoft.Databricks/workspaces/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Databricks/workspaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json b/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/version.json b/arm/Microsoft.DesktopVirtualization/hostpools/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DesktopVirtualization/hostpools/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/version.json b/arm/Microsoft.DesktopVirtualization/workspaces/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DesktopVirtualization/workspaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.EventGrid/topics/version.json b/arm/Microsoft.EventGrid/topics/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.EventGrid/topics/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json b/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/version.json b/arm/Microsoft.EventHub/namespaces/eventhubs/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/eventhubs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.EventHub/namespaces/version.json b/arm/Microsoft.EventHub/namespaces/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.EventHub/namespaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.HealthBot/healthBots/version.json b/arm/Microsoft.HealthBot/healthBots/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.HealthBot/healthBots/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Insights/actionGroups/version.json b/arm/Microsoft.Insights/actionGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Insights/actionGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Insights/activityLogAlerts/version.json b/arm/Microsoft.Insights/activityLogAlerts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Insights/activityLogAlerts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Insights/components/version.json b/arm/Microsoft.Insights/components/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Insights/components/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Insights/diagnosticSettings/version.json b/arm/Microsoft.Insights/diagnosticSettings/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Insights/diagnosticSettings/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Insights/metricAlerts/version.json b/arm/Microsoft.Insights/metricAlerts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Insights/metricAlerts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Insights/privateLinkScopes/version.json b/arm/Microsoft.Insights/privateLinkScopes/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Insights/privateLinkScopes/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/version.json b/arm/Microsoft.Insights/scheduledQueryRules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Insights/scheduledQueryRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json b/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.KeyVault/vaults/keys/version.json b/arm/Microsoft.KeyVault/vaults/keys/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.KeyVault/vaults/keys/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/version.json b/arm/Microsoft.KeyVault/vaults/secrets/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.KeyVault/vaults/secrets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.KeyVault/vaults/version.json b/arm/Microsoft.KeyVault/vaults/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.KeyVault/vaults/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Logic/workflows/version.json b/arm/Microsoft.Logic/workflows/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Logic/workflows/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/version.json b/arm/Microsoft.MachineLearningServices/workspaces/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.MachineLearningServices/workspaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/version.json b/arm/Microsoft.ManagedServices/registrationDefinitions/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ManagedServices/registrationDefinitions/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Management/managementGroups/version.json b/arm/Microsoft.Management/managementGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Management/managementGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.NetApp/netAppAccounts/version.json b/arm/Microsoft.NetApp/netAppAccounts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.NetApp/netAppAccounts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/applicationGateways/version.json b/arm/Microsoft.Network/applicationGateways/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/applicationGateways/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/version.json b/arm/Microsoft.Network/applicationSecurityGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/applicationSecurityGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/azureFirewalls/version.json b/arm/Microsoft.Network/azureFirewalls/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/azureFirewalls/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/bastionHosts/version.json b/arm/Microsoft.Network/bastionHosts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/bastionHosts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/connections/version.json b/arm/Microsoft.Network/connections/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/connections/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/version.json b/arm/Microsoft.Network/ddosProtectionPlans/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/ddosProtectionPlans/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/expressRouteCircuits/version.json b/arm/Microsoft.Network/expressRouteCircuits/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/expressRouteCircuits/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/ipGroups/version.json b/arm/Microsoft.Network/ipGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/ipGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/loadBalancers/version.json b/arm/Microsoft.Network/loadBalancers/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/loadBalancers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/localNetworkGateways/version.json b/arm/Microsoft.Network/localNetworkGateways/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/localNetworkGateways/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/natGateways/version.json b/arm/Microsoft.Network/natGateways/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/natGateways/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/networkSecurityGroups/version.json b/arm/Microsoft.Network/networkSecurityGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/networkSecurityGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json b/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/version.json b/arm/Microsoft.Network/networkWatchers/flowLogs/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/networkWatchers/flowLogs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/networkWatchers/version.json b/arm/Microsoft.Network/networkWatchers/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/networkWatchers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/privateDnsZones/version.json b/arm/Microsoft.Network/privateDnsZones/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/privateDnsZones/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/privateEndpoints/version.json b/arm/Microsoft.Network/privateEndpoints/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/privateEndpoints/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/publicIPAddresses/version.json b/arm/Microsoft.Network/publicIPAddresses/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/publicIPAddresses/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/publicIPPrefixes/version.json b/arm/Microsoft.Network/publicIPPrefixes/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/publicIPPrefixes/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/routeTables/version.json b/arm/Microsoft.Network/routeTables/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/routeTables/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/version.json b/arm/Microsoft.Network/trafficmanagerprofiles/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/trafficmanagerprofiles/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/version.json b/arm/Microsoft.Network/virtualNetworkGateways/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/virtualNetworkGateways/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/virtualNetworks/version.json b/arm/Microsoft.Network/virtualNetworks/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/virtualNetworks/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/virtualWans/version.json b/arm/Microsoft.Network/virtualWans/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/virtualWans/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json b/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.OperationalInsights/workspaces/version.json b/arm/Microsoft.OperationalInsights/workspaces/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.OperationalInsights/workspaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.RecoveryServices/vaults/version.json b/arm/Microsoft.RecoveryServices/vaults/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.RecoveryServices/vaults/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Resources/deploymentScripts/version.json b/arm/Microsoft.Resources/deploymentScripts/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Resources/deploymentScripts/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Resources/resourceGroups/version.json b/arm/Microsoft.Resources/resourceGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Resources/resourceGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Security/azureSecurityCenter/version.json b/arm/Microsoft.Security/azureSecurityCenter/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Security/azureSecurityCenter/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/version.json b/arm/Microsoft.ServiceBus/namespaces/queues/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/queues/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/version.json b/arm/Microsoft.ServiceBus/namespaces/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/administrators/version.json b/arm/Microsoft.Sql/managedInstances/administrators/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/administrators/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/databases/version.json b/arm/Microsoft.Sql/managedInstances/databases/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/databases/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json b/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/keys/version.json b/arm/Microsoft.Sql/managedInstances/keys/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/keys/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/version.json b/arm/Microsoft.Sql/managedInstances/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/servers/databases/version.json b/arm/Microsoft.Sql/servers/databases/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/servers/databases/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/servers/firewallRules/version.json b/arm/Microsoft.Sql/servers/firewallRules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/servers/firewallRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json b/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Sql/servers/version.json b/arm/Microsoft.Sql/servers/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Sql/servers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json b/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/version.json b/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json b/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Web/connections/version.json b/arm/Microsoft.Web/connections/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Web/connections/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Web/hostingEnvironments/version.json b/arm/Microsoft.Web/hostingEnvironments/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Web/hostingEnvironments/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Web/serverfarms/version.json b/arm/Microsoft.Web/serverfarms/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Web/serverfarms/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Web/sites/config/version.json b/arm/Microsoft.Web/sites/config/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Web/sites/config/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Web/sites/version.json b/arm/Microsoft.Web/sites/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Web/sites/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}

From 2e307683486ec02e3da5af5bde71c599d67ce237 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <marstor@hotmail.com>
Date: Thu, 9 Dec 2021 01:31:52 +0100
Subject: [PATCH 026/121] fix

---
 arm/.global/global.module.tests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm/.global/global.module.tests.ps1 b/arm/.global/global.module.tests.ps1
index eff8652baa..b6d8d52121 100644
--- a/arm/.global/global.module.tests.ps1
+++ b/arm/.global/global.module.tests.ps1
@@ -48,7 +48,7 @@ Describe 'File/folder tests' -Tag Modules {
             (Test-Path (Join-Path -Path $moduleFolderPath '.parameters')) | Should -Be $true
         }
 
-        It '[<moduleFolderName>] Module should contain a [version.json] folder' -TestCases $moduleFolderTestCases {
+        It '[<moduleFolderName>] Module should contain a [version.json] file' -TestCases $moduleFolderTestCases {
             param( [string] $moduleFolderPath )
             (Test-Path (Join-Path -Path $moduleFolderPath 'version.json')) | Should -Be $true
         }

From d60280c24b45831e341a6ed8c87d2e236a3224a4 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 20 Jan 2022 16:25:45 +0100
Subject: [PATCH 027/121] Fix MrMCake feedback

---
 .../templates/publishModule/action.yml        | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 771d6a84ed..9eff22b100 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -59,7 +59,7 @@ runs:
 
     - name: 'Publish module to template specs'
       shell: pwsh
-      # if: ${{ inputs.templateSpecsDoPublish == 'true' }}
+      if: ${{ inputs.templateSpecsDoPublish == 'true' }}
       run: |
         # Workaround until composite actions support conditions
         # Once available, remove this if and enable the step condition
@@ -100,41 +100,36 @@ runs:
 
     - name: 'Publish module to private bicep registry'
       shell: pwsh
-      # if: ${{ inputs.bicepRegistryDoPublish == 'true' }}
+      if: ${{ inputs.bicepRegistryDoPublish == 'true' }}
       run: |
         # Workaround until composite actions support conditions
         # Once available, remove this if and enable the step condition
-        if('${{ inputs.bicepRegistryDoPublish }}' -eq 'true') {
-
-          # Load used functions
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
+        # Load used functions
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
 
-          $functionInput = @{
-            TemplateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
-          }
+        $functionInput = @{
+          TemplateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
+        }
 
-          Write-Output "Invoke task with"
-          Write-Output ($functionInput | ConvertTo-Json | Out-String)
+        Write-Output "Invoke task with"
+        Write-Output ($functionInput | ConvertTo-Json | Out-String)
 
-          # Get the modified child resources
-          $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
+        # Get the modified child resources
+        $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
 
-          # Publish the modified child resources
-          foreach ($ModuleToUpdate in $ModulesToUpdate) {
-            $functionInput = @{
-              TemplateFilePath        = $ModuleToUpdate.TemplateFilePath
-              BicepRegistryName       = '${{ inputs.bicepRegistryName }}'
-              BicepRegistryRgName     = '${{ inputs.bicepRegistryRgName }}'
-              bicepRegistryRgLocation = '${{ inputs.bicepRegistryRgLocation }}'
-              ModuleVersion           = $ModuleToUpdate.Version
-            }
+        # Publish the modified child resources
+        foreach ($ModuleToUpdate in $ModulesToUpdate) {
+          $functionInput = @{
+            TemplateFilePath        = $ModuleToUpdate.TemplateFilePath
+            BicepRegistryName       = '${{ inputs.bicepRegistryName }}'
+            BicepRegistryRgName     = '${{ inputs.bicepRegistryRgName }}'
+            bicepRegistryRgLocation = '${{ inputs.bicepRegistryRgLocation }}'
+            ModuleVersion           = $ModuleToUpdate.Version
+          }
 
-            Write-Verbose "Invoke task with" -Verbose
-            Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+          Write-Verbose "Invoke task with" -Verbose
+          Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-            Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
-          }
-        } else {
-          Write-Output "Pipeline is configured to not publish to TemplateSpecs"
+          Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
         }

From 45cdfcc55c1031753b2dcf462a44e6dc4997d3d4 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 20 Jan 2022 16:27:43 +0100
Subject: [PATCH 028/121] Fix for Template Spec condition

---
 .../templates/publishModule/action.yml        | 49 +++++++++----------
 1 file changed, 22 insertions(+), 27 deletions(-)

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 9eff22b100..398ecfdcd7 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -63,39 +63,34 @@ runs:
       run: |
         # Workaround until composite actions support conditions
         # Once available, remove this if and enable the step condition
-        if('${{ inputs.templateSpecsDoPublish }}' -eq 'true') {
-
-          # Load used functions
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
-          . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
+        # Load used functions
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
+        . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
 
-          $functionInput = @{
-            TemplateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
-          }
+        $functionInput = @{
+          TemplateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
+        }
 
-          Write-Output "Invoke task with"
-          Write-Output ($functionInput | ConvertTo-Json | Out-String)
+        Write-Output "Invoke task with"
+        Write-Output ($functionInput | ConvertTo-Json | Out-String)
 
-          # Get the modified child resources
-          $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
+        # Get the modified child resources
+        $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
 
-          # Publish the modified child resources
-          foreach ($ModuleToUpdate in $ModulesToUpdate) {
-            $functionInput = @{
-              templateFilePath         = $ModuleToUpdate.TemplateFilePath
-              templateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
-              templateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
-              templateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
-              ModuleVersion            = $ModuleToUpdate.Version
-            }
+        # Publish the modified child resources
+        foreach ($ModuleToUpdate in $ModulesToUpdate) {
+          $functionInput = @{
+            templateFilePath         = $ModuleToUpdate.TemplateFilePath
+            templateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
+            templateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
+            templateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
+            ModuleVersion            = $ModuleToUpdate.Version
+          }
 
-            Write-Verbose "Invoke task with" -Verbose
-            Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+          Write-Verbose "Invoke task with" -Verbose
+          Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-            Publish-ModuleToTemplateSpec @functionInput -Verbose
-          }
-        } else {
-          Write-Output "Pipeline is configured to not publish to TemplateSpecs"
+          Publish-ModuleToTemplateSpec @functionInput -Verbose
         }
 
     - name: 'Publish module to private bicep registry'

From 89adb70b2f60537a7d8b8b028855e13b899f91a0 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 20 Jan 2022 16:30:20 +0100
Subject: [PATCH 029/121] Consistancy

---
 .github/actions/templates/publishModule/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 398ecfdcd7..f18e58feb5 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -71,8 +71,8 @@ runs:
           TemplateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
         }
 
-        Write-Output "Invoke task with"
-        Write-Output ($functionInput | ConvertTo-Json | Out-String)
+        Write-Verbose "Invoke task with" -Verbose
+        Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
         # Get the modified child resources
         $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose

From 76ef2ac1d033f681bb509713f2a23d12f465e3c7 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Thu, 20 Jan 2022 16:30:45 +0100
Subject: [PATCH 030/121] Concistency

---
 .github/actions/templates/publishModule/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index f18e58feb5..01f723670d 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -107,8 +107,8 @@ runs:
           TemplateFilePath = Join-Path $env:GITHUB_WORKSPACE "${{ inputs.templateFilePath }}"
         }
 
-        Write-Output "Invoke task with"
-        Write-Output ($functionInput | ConvertTo-Json | Out-String)
+        Write-Verbose "Invoke task with" -Verbose
+        Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
         # Get the modified child resources
         $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose

From 86e647e96aa7ec8a230fcc13ca54246ef89d6dba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Fri, 21 Jan 2022 18:10:11 +0800
Subject: [PATCH 031/121] modification test

---
 arm/Microsoft.Batch/batchAccounts/deploy.bicep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm/Microsoft.Batch/batchAccounts/deploy.bicep b/arm/Microsoft.Batch/batchAccounts/deploy.bicep
index a30debf1ff..4838ecd8bd 100644
--- a/arm/Microsoft.Batch/batchAccounts/deploy.bicep
+++ b/arm/Microsoft.Batch/batchAccounts/deploy.bicep
@@ -18,7 +18,7 @@ param diagnosticWorkspaceId string = ''
 @description('Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.')
 param diagnosticEventHubAuthorizationRuleId string = ''
 
-@description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.')
+@description('Optional.. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.')
 param diagnosticEventHubName string = ''
 
 @allowed([

From 74787968874371458a15c5bea820ef55d6612a45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Fri, 21 Jan 2022 18:15:37 +0800
Subject: [PATCH 032/121] revert

---
 arm/Microsoft.Batch/batchAccounts/deploy.bicep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm/Microsoft.Batch/batchAccounts/deploy.bicep b/arm/Microsoft.Batch/batchAccounts/deploy.bicep
index 4838ecd8bd..a30debf1ff 100644
--- a/arm/Microsoft.Batch/batchAccounts/deploy.bicep
+++ b/arm/Microsoft.Batch/batchAccounts/deploy.bicep
@@ -18,7 +18,7 @@ param diagnosticWorkspaceId string = ''
 @description('Optional. Resource ID of the diagnostic event hub authorization rule for the Event Hubs namespace in which the event hub should be created or streamed to.')
 param diagnosticEventHubAuthorizationRuleId string = ''
 
-@description('Optional.. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.')
+@description('Optional. Name of the diagnostic event hub within the namespace to which logs are streamed. Without this, an event hub is created for each log category.')
 param diagnosticEventHubName string = ''
 
 @allowed([

From 79c1e655dea998d709edb04a113af51afc1cc83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Fri, 21 Jan 2022 18:22:46 +0800
Subject: [PATCH 033/121] leaving exception for now

---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index fa6c326db9..7b75e5be44 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -127,9 +127,9 @@ function Get-TemplateFileToUpdate {
         Find-TemplateFile -Path $_.FullName -Verbose
     } | Sort-Object -Property FullName -Unique -Descending
 
-    if ($TemplateFilesToUpdate.Count -eq 0) {
+    <# if ($TemplateFilesToUpdate.Count -eq 0) {
         throw 'No template file found in the modified module.'
-    }
+    } #>
 
     Write-Verbose ('Modified modules found: [{0}]' -f $TemplateFilesToUpdate.count)
     $TemplateFilesToUpdate | ForEach-Object {

From 0511bc295787973128c097e8d304fc9c10e599f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Fri, 21 Jan 2022 18:36:22 +0800
Subject: [PATCH 034/121] verbose

---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 7b75e5be44..5a534c80a7 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -127,9 +127,9 @@ function Get-TemplateFileToUpdate {
         Find-TemplateFile -Path $_.FullName -Verbose
     } | Sort-Object -Property FullName -Unique -Descending
 
-    <# if ($TemplateFilesToUpdate.Count -eq 0) {
-        throw 'No template file found in the modified module.'
-    } #>
+    if ($TemplateFilesToUpdate.Count -eq 0) {
+        Write-Verbose 'No template file found in the modified module.'
+    }
 
     Write-Verbose ('Modified modules found: [{0}]' -f $TemplateFilesToUpdate.count)
     $TemplateFilesToUpdate | ForEach-Object {

From dd7db4e36dae43ae0eb63f80af1a6cac7e4933b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Sat, 22 Jan 2022 12:28:02 +0800
Subject: [PATCH 035/121] if

---
 .github/workflows/ms.analysisservices.servers.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
index cfc2564892..7499e82d48 100644
--- a/.github/workflows/ms.analysisservices.servers.yml
+++ b/.github/workflows/ms.analysisservices.servers.yml
@@ -107,7 +107,10 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: |
+      github.ref == 'refs/heads/main ||
+      github.ref == 'refs/heads/master ||
+      github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param

From a323b0b8f16fd3041efe9c38d6db2b4867d833ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Sat, 22 Jan 2022 12:29:56 +0800
Subject: [PATCH 036/121] '

---
 .github/workflows/ms.analysisservices.servers.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
index 7499e82d48..678e048ed2 100644
--- a/.github/workflows/ms.analysisservices.servers.yml
+++ b/.github/workflows/ms.analysisservices.servers.yml
@@ -108,8 +108,8 @@ jobs:
   job_publish_module:
     name: 'Publish module'
     if: |
-      github.ref == 'refs/heads/main ||
-      github.ref == 'refs/heads/master ||
+      github.ref == 'refs/heads/main' ||
+      github.ref == 'refs/heads/master' ||
       github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:

From 3556c4518d96020b3dc84b354cd209985bd673ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Sat, 22 Jan 2022 12:58:48 +0800
Subject: [PATCH 037/121] condition fix

---
 .github/workflows/ms.analysisservices.servers.yml               | 2 +-
 .github/workflows/ms.apimanagement.service.yml                  | 2 +-
 .github/workflows/ms.authorization.policyassignments.yml        | 2 +-
 .github/workflows/ms.authorization.policydefinitions.yml        | 2 +-
 .github/workflows/ms.authorization.policyexemptions.yml         | 2 +-
 .github/workflows/ms.authorization.policysetdefinitions.yml     | 2 +-
 .github/workflows/ms.authorization.roleassignments.yml          | 2 +-
 .github/workflows/ms.authorization.roledefinitions.yml          | 2 +-
 .github/workflows/ms.automanage.accounts.yml                    | 2 +-
 .github/workflows/ms.automation.automationaccounts.yml          | 2 +-
 .github/workflows/ms.batch.batchaccounts.yml                    | 2 +-
 .github/workflows/ms.cognitiveservices.accounts.yml             | 2 +-
 .github/workflows/ms.compute.availabilitysets.yml               | 2 +-
 .github/workflows/ms.compute.diskencryptionsets.yml             | 2 +-
 .github/workflows/ms.compute.galleries.yml                      | 2 +-
 .github/workflows/ms.compute.images.yml                         | 2 +-
 .github/workflows/ms.compute.proximityplacementgroups.yml       | 2 +-
 .github/workflows/ms.compute.virtualmachines.yml                | 2 +-
 .github/workflows/ms.compute.virtualmachinescalesets.yml        | 2 +-
 .github/workflows/ms.consumption.budgets.yml                    | 2 +-
 .github/workflows/ms.containerinstance.containergroups.yml      | 2 +-
 .github/workflows/ms.containerregistry.registries.yml           | 2 +-
 .github/workflows/ms.containerservice.managedclusters.yml       | 2 +-
 .github/workflows/ms.databricks.workspaces.yml                  | 2 +-
 .github/workflows/ms.datafactory.factories.yml                  | 2 +-
 .../workflows/ms.desktopvirtualization.applicationgroups.yml    | 2 +-
 .github/workflows/ms.desktopvirtualization.hostpools.yml        | 2 +-
 .github/workflows/ms.desktopvirtualization.workspaces.yml       | 2 +-
 .github/workflows/ms.documentdb.databaseaccounts.yml            | 2 +-
 .github/workflows/ms.eventgrid.topics.yml                       | 2 +-
 .github/workflows/ms.eventhub.namespaces.yml                    | 2 +-
 .github/workflows/ms.healthbot.healthbots.yml                   | 2 +-
 .github/workflows/ms.insights.actiongroups.yml                  | 2 +-
 .github/workflows/ms.insights.activitylogalerts.yml             | 2 +-
 .github/workflows/ms.insights.components.yml                    | 2 +-
 .github/workflows/ms.insights.diagnosticsettings.yml            | 2 +-
 .github/workflows/ms.insights.metricalerts.yml                  | 2 +-
 .github/workflows/ms.insights.privatelinkscopes.yml             | 2 +-
 .github/workflows/ms.insights.scheduledqueryrules.yml           | 2 +-
 .github/workflows/ms.keyvault.vaults.yml                        | 2 +-
 .github/workflows/ms.logic.workflows.yml                        | 2 +-
 .github/workflows/ms.machinelearningservices.workspaces.yml     | 2 +-
 .github/workflows/ms.managedidentity.userassignedidentities.yml | 2 +-
 .../workflows/ms.managedservices.registrationdefinitions.yml    | 2 +-
 .github/workflows/ms.management.managementgroups.yml            | 2 +-
 .github/workflows/ms.netapp.netappaccounts.yml                  | 2 +-
 .github/workflows/ms.network.applicationgateways.yml            | 2 +-
 .github/workflows/ms.network.applicationsecuritygroups.yml      | 2 +-
 .github/workflows/ms.network.azurefirewalls.yml                 | 2 +-
 .github/workflows/ms.network.bastionhosts.yml                   | 2 +-
 .github/workflows/ms.network.connections.yml                    | 2 +-
 .github/workflows/ms.network.ddosprotectionplans.yml            | 2 +-
 .github/workflows/ms.network.expressroutecircuits.yml           | 2 +-
 .github/workflows/ms.network.firewallpolicies.yml               | 2 +-
 .github/workflows/ms.network.ipgroups.yml                       | 2 +-
 .github/workflows/ms.network.loadbalancers.yml                  | 2 +-
 .github/workflows/ms.network.localnetworkgateways.yml           | 2 +-
 .github/workflows/ms.network.natgateways.yml                    | 2 +-
 .github/workflows/ms.network.networksecuritygroups.yml          | 2 +-
 .github/workflows/ms.network.networkwatchers.yml                | 2 +-
 .github/workflows/ms.network.privatednszones.yml                | 2 +-
 .github/workflows/ms.network.privateendpoints.yml               | 2 +-
 .github/workflows/ms.network.publicipaddresses.yml              | 2 +-
 .github/workflows/ms.network.publicipprefixes.yml               | 2 +-
 .github/workflows/ms.network.routetables.yml                    | 2 +-
 .github/workflows/ms.network.trafficmanagerprofiles.yml         | 2 +-
 .github/workflows/ms.network.virtualnetworkgateways.yml         | 2 +-
 .github/workflows/ms.network.virtualnetworks.yml                | 2 +-
 .github/workflows/ms.network.virtualwans.yml                    | 2 +-
 .github/workflows/ms.operationalinsights.workspaces.yml         | 2 +-
 .github/workflows/ms.recoveryservices.vaults.yml                | 2 +-
 .github/workflows/ms.resources.deploymentscripts.yml            | 2 +-
 .github/workflows/ms.resources.resourcegroups.yml               | 2 +-
 .github/workflows/ms.security.azuresecuritycenter.yml           | 2 +-
 .github/workflows/ms.servicebus.namespaces.yml                  | 2 +-
 .github/workflows/ms.sql.managedinstances.yml                   | 2 +-
 .github/workflows/ms.sql.servers.yml                            | 2 +-
 .github/workflows/ms.storage.storageaccounts.yml                | 2 +-
 .github/workflows/ms.synapse.privatelinkhubs.yml                | 2 +-
 .github/workflows/ms.virtualmachineimages.imagetemplates.yml    | 2 +-
 .github/workflows/ms.web.connections.yml                        | 2 +-
 .github/workflows/ms.web.hostingenvironments.yml                | 2 +-
 .github/workflows/ms.web.serverfarms.yml                        | 2 +-
 .github/workflows/ms.web.sites.yml                              | 2 +-
 84 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
index c99ceea129..3f532ebcc1 100644
--- a/.github/workflows/ms.analysisservices.servers.yml
+++ b/.github/workflows/ms.analysisservices.servers.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.apimanagement.service.yml b/.github/workflows/ms.apimanagement.service.yml
index 0acd8622a1..1b9e44a6e8 100644
--- a/.github/workflows/ms.apimanagement.service.yml
+++ b/.github/workflows/ms.apimanagement.service.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.policyassignments.yml b/.github/workflows/ms.authorization.policyassignments.yml
index fc4117e346..45e96b002d 100644
--- a/.github/workflows/ms.authorization.policyassignments.yml
+++ b/.github/workflows/ms.authorization.policyassignments.yml
@@ -121,7 +121,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.policydefinitions.yml b/.github/workflows/ms.authorization.policydefinitions.yml
index 4a92059827..dfb2f7b289 100644
--- a/.github/workflows/ms.authorization.policydefinitions.yml
+++ b/.github/workflows/ms.authorization.policydefinitions.yml
@@ -121,7 +121,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.policyexemptions.yml b/.github/workflows/ms.authorization.policyexemptions.yml
index e61317771a..8553c234df 100644
--- a/.github/workflows/ms.authorization.policyexemptions.yml
+++ b/.github/workflows/ms.authorization.policyexemptions.yml
@@ -121,7 +121,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.policysetdefinitions.yml b/.github/workflows/ms.authorization.policysetdefinitions.yml
index 49b470cf54..13155a9403 100644
--- a/.github/workflows/ms.authorization.policysetdefinitions.yml
+++ b/.github/workflows/ms.authorization.policysetdefinitions.yml
@@ -121,7 +121,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.roleassignments.yml b/.github/workflows/ms.authorization.roleassignments.yml
index 8f558fdc61..4830213530 100644
--- a/.github/workflows/ms.authorization.roleassignments.yml
+++ b/.github/workflows/ms.authorization.roleassignments.yml
@@ -121,7 +121,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml
index c0f2d66a51..7a55e15465 100644
--- a/.github/workflows/ms.authorization.roledefinitions.yml
+++ b/.github/workflows/ms.authorization.roledefinitions.yml
@@ -121,7 +121,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.automanage.accounts.yml b/.github/workflows/ms.automanage.accounts.yml
index bde3575184..f6b6e6d0b6 100644
--- a/.github/workflows/ms.automanage.accounts.yml
+++ b/.github/workflows/ms.automanage.accounts.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.automation.automationaccounts.yml b/.github/workflows/ms.automation.automationaccounts.yml
index b87fd08439..b5d482e34e 100644
--- a/.github/workflows/ms.automation.automationaccounts.yml
+++ b/.github/workflows/ms.automation.automationaccounts.yml
@@ -118,7 +118,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.batch.batchaccounts.yml b/.github/workflows/ms.batch.batchaccounts.yml
index 60d612a8d6..54c6c5f37a 100644
--- a/.github/workflows/ms.batch.batchaccounts.yml
+++ b/.github/workflows/ms.batch.batchaccounts.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.cognitiveservices.accounts.yml b/.github/workflows/ms.cognitiveservices.accounts.yml
index 9ebcdd3cca..8493325851 100644
--- a/.github/workflows/ms.cognitiveservices.accounts.yml
+++ b/.github/workflows/ms.cognitiveservices.accounts.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.availabilitysets.yml b/.github/workflows/ms.compute.availabilitysets.yml
index 1c9f802067..0a0c090eeb 100644
--- a/.github/workflows/ms.compute.availabilitysets.yml
+++ b/.github/workflows/ms.compute.availabilitysets.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.diskencryptionsets.yml b/.github/workflows/ms.compute.diskencryptionsets.yml
index 6a70aa4075..0d66685e36 100644
--- a/.github/workflows/ms.compute.diskencryptionsets.yml
+++ b/.github/workflows/ms.compute.diskencryptionsets.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.galleries.yml b/.github/workflows/ms.compute.galleries.yml
index ddbd43a5e8..e755a83040 100644
--- a/.github/workflows/ms.compute.galleries.yml
+++ b/.github/workflows/ms.compute.galleries.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.images.yml b/.github/workflows/ms.compute.images.yml
index 2121abf05c..d36d12092b 100644
--- a/.github/workflows/ms.compute.images.yml
+++ b/.github/workflows/ms.compute.images.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.proximityplacementgroups.yml b/.github/workflows/ms.compute.proximityplacementgroups.yml
index 63cc4cf8b6..7424499e61 100644
--- a/.github/workflows/ms.compute.proximityplacementgroups.yml
+++ b/.github/workflows/ms.compute.proximityplacementgroups.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.virtualmachines.yml b/.github/workflows/ms.compute.virtualmachines.yml
index a353b99156..470f04159c 100644
--- a/.github/workflows/ms.compute.virtualmachines.yml
+++ b/.github/workflows/ms.compute.virtualmachines.yml
@@ -123,7 +123,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.virtualmachinescalesets.yml b/.github/workflows/ms.compute.virtualmachinescalesets.yml
index fc0e039bbd..57597dd4ce 100644
--- a/.github/workflows/ms.compute.virtualmachinescalesets.yml
+++ b/.github/workflows/ms.compute.virtualmachinescalesets.yml
@@ -123,7 +123,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.consumption.budgets.yml b/.github/workflows/ms.consumption.budgets.yml
index 62c0f2b66e..81679ce2c3 100644
--- a/.github/workflows/ms.consumption.budgets.yml
+++ b/.github/workflows/ms.consumption.budgets.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.containerinstance.containergroups.yml b/.github/workflows/ms.containerinstance.containergroups.yml
index 0c57cd4258..664ae9f850 100644
--- a/.github/workflows/ms.containerinstance.containergroups.yml
+++ b/.github/workflows/ms.containerinstance.containergroups.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.containerregistry.registries.yml b/.github/workflows/ms.containerregistry.registries.yml
index 97ac7afaa9..db30453b6a 100644
--- a/.github/workflows/ms.containerregistry.registries.yml
+++ b/.github/workflows/ms.containerregistry.registries.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.containerservice.managedclusters.yml b/.github/workflows/ms.containerservice.managedclusters.yml
index 9f9b415ad5..1e5ed28873 100644
--- a/.github/workflows/ms.containerservice.managedclusters.yml
+++ b/.github/workflows/ms.containerservice.managedclusters.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.databricks.workspaces.yml b/.github/workflows/ms.databricks.workspaces.yml
index 97cff997ce..5626904350 100644
--- a/.github/workflows/ms.databricks.workspaces.yml
+++ b/.github/workflows/ms.databricks.workspaces.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.datafactory.factories.yml b/.github/workflows/ms.datafactory.factories.yml
index dbb25f5939..a7e60ccabf 100644
--- a/.github/workflows/ms.datafactory.factories.yml
+++ b/.github/workflows/ms.datafactory.factories.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
index 4aaadda381..de0c910a4f 100644
--- a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
+++ b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml
index 257e283f8a..2b1508c6bb 100644
--- a/.github/workflows/ms.desktopvirtualization.hostpools.yml
+++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.desktopvirtualization.workspaces.yml b/.github/workflows/ms.desktopvirtualization.workspaces.yml
index b3537ef1d7..13c8d59815 100644
--- a/.github/workflows/ms.desktopvirtualization.workspaces.yml
+++ b/.github/workflows/ms.desktopvirtualization.workspaces.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.documentdb.databaseaccounts.yml b/.github/workflows/ms.documentdb.databaseaccounts.yml
index 52ea4f5be6..87c5de8f98 100644
--- a/.github/workflows/ms.documentdb.databaseaccounts.yml
+++ b/.github/workflows/ms.documentdb.databaseaccounts.yml
@@ -122,7 +122,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.eventgrid.topics.yml b/.github/workflows/ms.eventgrid.topics.yml
index 2912bd329d..19235d5115 100644
--- a/.github/workflows/ms.eventgrid.topics.yml
+++ b/.github/workflows/ms.eventgrid.topics.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.eventhub.namespaces.yml b/.github/workflows/ms.eventhub.namespaces.yml
index 12d793dfbd..b1b7639431 100644
--- a/.github/workflows/ms.eventhub.namespaces.yml
+++ b/.github/workflows/ms.eventhub.namespaces.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.healthbot.healthbots.yml b/.github/workflows/ms.healthbot.healthbots.yml
index e18c281b61..ba0baadff0 100644
--- a/.github/workflows/ms.healthbot.healthbots.yml
+++ b/.github/workflows/ms.healthbot.healthbots.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.actiongroups.yml b/.github/workflows/ms.insights.actiongroups.yml
index e559612537..043b67979b 100644
--- a/.github/workflows/ms.insights.actiongroups.yml
+++ b/.github/workflows/ms.insights.actiongroups.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.activitylogalerts.yml b/.github/workflows/ms.insights.activitylogalerts.yml
index 683899c25f..8db6976cd1 100644
--- a/.github/workflows/ms.insights.activitylogalerts.yml
+++ b/.github/workflows/ms.insights.activitylogalerts.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.components.yml b/.github/workflows/ms.insights.components.yml
index 62d534e519..5bc071ff22 100644
--- a/.github/workflows/ms.insights.components.yml
+++ b/.github/workflows/ms.insights.components.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.diagnosticsettings.yml b/.github/workflows/ms.insights.diagnosticsettings.yml
index 7f8a78bea7..59fd515cba 100644
--- a/.github/workflows/ms.insights.diagnosticsettings.yml
+++ b/.github/workflows/ms.insights.diagnosticsettings.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.metricalerts.yml b/.github/workflows/ms.insights.metricalerts.yml
index d9873716e0..f02d6078e6 100644
--- a/.github/workflows/ms.insights.metricalerts.yml
+++ b/.github/workflows/ms.insights.metricalerts.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.privatelinkscopes.yml b/.github/workflows/ms.insights.privatelinkscopes.yml
index b252620f35..897b469587 100644
--- a/.github/workflows/ms.insights.privatelinkscopes.yml
+++ b/.github/workflows/ms.insights.privatelinkscopes.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.scheduledqueryrules.yml b/.github/workflows/ms.insights.scheduledqueryrules.yml
index af9f9766b1..e0056aec98 100644
--- a/.github/workflows/ms.insights.scheduledqueryrules.yml
+++ b/.github/workflows/ms.insights.scheduledqueryrules.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.keyvault.vaults.yml b/.github/workflows/ms.keyvault.vaults.yml
index 12ab4c2233..3ff592d8cc 100644
--- a/.github/workflows/ms.keyvault.vaults.yml
+++ b/.github/workflows/ms.keyvault.vaults.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.logic.workflows.yml b/.github/workflows/ms.logic.workflows.yml
index 1d2ecdd6df..d1ce9fe0ae 100644
--- a/.github/workflows/ms.logic.workflows.yml
+++ b/.github/workflows/ms.logic.workflows.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.machinelearningservices.workspaces.yml b/.github/workflows/ms.machinelearningservices.workspaces.yml
index 9594332ae3..98d4204762 100644
--- a/.github/workflows/ms.machinelearningservices.workspaces.yml
+++ b/.github/workflows/ms.machinelearningservices.workspaces.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.managedidentity.userassignedidentities.yml b/.github/workflows/ms.managedidentity.userassignedidentities.yml
index 5e92031fa2..6a85749e24 100644
--- a/.github/workflows/ms.managedidentity.userassignedidentities.yml
+++ b/.github/workflows/ms.managedidentity.userassignedidentities.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.managedservices.registrationdefinitions.yml b/.github/workflows/ms.managedservices.registrationdefinitions.yml
index 8e5df6e199..3485132bca 100644
--- a/.github/workflows/ms.managedservices.registrationdefinitions.yml
+++ b/.github/workflows/ms.managedservices.registrationdefinitions.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.management.managementgroups.yml b/.github/workflows/ms.management.managementgroups.yml
index b10520e08e..be2e471f51 100644
--- a/.github/workflows/ms.management.managementgroups.yml
+++ b/.github/workflows/ms.management.managementgroups.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.netapp.netappaccounts.yml b/.github/workflows/ms.netapp.netappaccounts.yml
index d94fb9aa48..bcd3e7b435 100644
--- a/.github/workflows/ms.netapp.netappaccounts.yml
+++ b/.github/workflows/ms.netapp.netappaccounts.yml
@@ -122,7 +122,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.applicationgateways.yml b/.github/workflows/ms.network.applicationgateways.yml
index c1eb765b93..f10b8ca14d 100644
--- a/.github/workflows/ms.network.applicationgateways.yml
+++ b/.github/workflows/ms.network.applicationgateways.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.applicationsecuritygroups.yml b/.github/workflows/ms.network.applicationsecuritygroups.yml
index 3a1c7c0a44..b9a654c8c6 100644
--- a/.github/workflows/ms.network.applicationsecuritygroups.yml
+++ b/.github/workflows/ms.network.applicationsecuritygroups.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.azurefirewalls.yml b/.github/workflows/ms.network.azurefirewalls.yml
index 1404cb4367..a1eb7d027d 100644
--- a/.github/workflows/ms.network.azurefirewalls.yml
+++ b/.github/workflows/ms.network.azurefirewalls.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.bastionhosts.yml b/.github/workflows/ms.network.bastionhosts.yml
index d85dc19a88..ebd3c3b147 100644
--- a/.github/workflows/ms.network.bastionhosts.yml
+++ b/.github/workflows/ms.network.bastionhosts.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.connections.yml b/.github/workflows/ms.network.connections.yml
index 5853506d11..e227ef0063 100644
--- a/.github/workflows/ms.network.connections.yml
+++ b/.github/workflows/ms.network.connections.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.ddosprotectionplans.yml b/.github/workflows/ms.network.ddosprotectionplans.yml
index 8bbe0b5ba2..03f8a75328 100644
--- a/.github/workflows/ms.network.ddosprotectionplans.yml
+++ b/.github/workflows/ms.network.ddosprotectionplans.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.expressroutecircuits.yml b/.github/workflows/ms.network.expressroutecircuits.yml
index bc549635d7..b3285f8592 100644
--- a/.github/workflows/ms.network.expressroutecircuits.yml
+++ b/.github/workflows/ms.network.expressroutecircuits.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.firewallpolicies.yml b/.github/workflows/ms.network.firewallpolicies.yml
index 5ec28420f2..a5d24014d3 100644
--- a/.github/workflows/ms.network.firewallpolicies.yml
+++ b/.github/workflows/ms.network.firewallpolicies.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.ipgroups.yml b/.github/workflows/ms.network.ipgroups.yml
index 8bd74e9c69..ad09d261cb 100644
--- a/.github/workflows/ms.network.ipgroups.yml
+++ b/.github/workflows/ms.network.ipgroups.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.loadbalancers.yml b/.github/workflows/ms.network.loadbalancers.yml
index bce9ddeadc..a59b80ee7f 100644
--- a/.github/workflows/ms.network.loadbalancers.yml
+++ b/.github/workflows/ms.network.loadbalancers.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.localnetworkgateways.yml b/.github/workflows/ms.network.localnetworkgateways.yml
index db19b75b95..e235374b52 100644
--- a/.github/workflows/ms.network.localnetworkgateways.yml
+++ b/.github/workflows/ms.network.localnetworkgateways.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.natgateways.yml b/.github/workflows/ms.network.natgateways.yml
index 74ca4dfc0d..a093fb5066 100644
--- a/.github/workflows/ms.network.natgateways.yml
+++ b/.github/workflows/ms.network.natgateways.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.networksecuritygroups.yml b/.github/workflows/ms.network.networksecuritygroups.yml
index ddfefd2739..2c75fbc2ec 100644
--- a/.github/workflows/ms.network.networksecuritygroups.yml
+++ b/.github/workflows/ms.network.networksecuritygroups.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.networkwatchers.yml b/.github/workflows/ms.network.networkwatchers.yml
index 597352ac87..e9cf1d5704 100644
--- a/.github/workflows/ms.network.networkwatchers.yml
+++ b/.github/workflows/ms.network.networkwatchers.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.privatednszones.yml b/.github/workflows/ms.network.privatednszones.yml
index eecc0027e1..ee1f30f98e 100644
--- a/.github/workflows/ms.network.privatednszones.yml
+++ b/.github/workflows/ms.network.privatednszones.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.privateendpoints.yml b/.github/workflows/ms.network.privateendpoints.yml
index cb135a4b05..04faea807a 100644
--- a/.github/workflows/ms.network.privateendpoints.yml
+++ b/.github/workflows/ms.network.privateendpoints.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.publicipaddresses.yml b/.github/workflows/ms.network.publicipaddresses.yml
index b565b7e81d..a12d48a663 100644
--- a/.github/workflows/ms.network.publicipaddresses.yml
+++ b/.github/workflows/ms.network.publicipaddresses.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.publicipprefixes.yml b/.github/workflows/ms.network.publicipprefixes.yml
index 2dedd6fa0b..41a4a80b10 100644
--- a/.github/workflows/ms.network.publicipprefixes.yml
+++ b/.github/workflows/ms.network.publicipprefixes.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.routetables.yml b/.github/workflows/ms.network.routetables.yml
index c10feca3fb..3232398908 100644
--- a/.github/workflows/ms.network.routetables.yml
+++ b/.github/workflows/ms.network.routetables.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.trafficmanagerprofiles.yml b/.github/workflows/ms.network.trafficmanagerprofiles.yml
index 388768c0cc..bea5982054 100644
--- a/.github/workflows/ms.network.trafficmanagerprofiles.yml
+++ b/.github/workflows/ms.network.trafficmanagerprofiles.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.virtualnetworkgateways.yml b/.github/workflows/ms.network.virtualnetworkgateways.yml
index 4d827dd5dd..6d616ce735 100644
--- a/.github/workflows/ms.network.virtualnetworkgateways.yml
+++ b/.github/workflows/ms.network.virtualnetworkgateways.yml
@@ -118,7 +118,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.virtualnetworks.yml b/.github/workflows/ms.network.virtualnetworks.yml
index 81e877e76b..9a3a5d93ad 100644
--- a/.github/workflows/ms.network.virtualnetworks.yml
+++ b/.github/workflows/ms.network.virtualnetworks.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.virtualwans.yml b/.github/workflows/ms.network.virtualwans.yml
index 3532fc57f6..8a5ea73264 100644
--- a/.github/workflows/ms.network.virtualwans.yml
+++ b/.github/workflows/ms.network.virtualwans.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.operationalinsights.workspaces.yml b/.github/workflows/ms.operationalinsights.workspaces.yml
index 8304815609..1f72e176c4 100644
--- a/.github/workflows/ms.operationalinsights.workspaces.yml
+++ b/.github/workflows/ms.operationalinsights.workspaces.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.recoveryservices.vaults.yml b/.github/workflows/ms.recoveryservices.vaults.yml
index c2baccd7c6..b65535e975 100644
--- a/.github/workflows/ms.recoveryservices.vaults.yml
+++ b/.github/workflows/ms.recoveryservices.vaults.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.resources.deploymentscripts.yml b/.github/workflows/ms.resources.deploymentscripts.yml
index fbbf16df72..8dc96c21c7 100644
--- a/.github/workflows/ms.resources.deploymentscripts.yml
+++ b/.github/workflows/ms.resources.deploymentscripts.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.resources.resourcegroups.yml b/.github/workflows/ms.resources.resourcegroups.yml
index 91f4c5c002..cab4971d45 100644
--- a/.github/workflows/ms.resources.resourcegroups.yml
+++ b/.github/workflows/ms.resources.resourcegroups.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.security.azuresecuritycenter.yml b/.github/workflows/ms.security.azuresecuritycenter.yml
index 962286702a..7b4cf24419 100644
--- a/.github/workflows/ms.security.azuresecuritycenter.yml
+++ b/.github/workflows/ms.security.azuresecuritycenter.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.servicebus.namespaces.yml b/.github/workflows/ms.servicebus.namespaces.yml
index 97ba4cf68c..aff590f61c 100644
--- a/.github/workflows/ms.servicebus.namespaces.yml
+++ b/.github/workflows/ms.servicebus.namespaces.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.sql.managedinstances.yml b/.github/workflows/ms.sql.managedinstances.yml
index 6195eefd6f..31bfb89e57 100644
--- a/.github/workflows/ms.sql.managedinstances.yml
+++ b/.github/workflows/ms.sql.managedinstances.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.sql.servers.yml b/.github/workflows/ms.sql.servers.yml
index 2c7304ae8d..80819f9b44 100644
--- a/.github/workflows/ms.sql.servers.yml
+++ b/.github/workflows/ms.sql.servers.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index df763612ad..4dd38022f7 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -118,7 +118,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.synapse.privatelinkhubs.yml b/.github/workflows/ms.synapse.privatelinkhubs.yml
index 85a7334ec9..fb7c311171 100644
--- a/.github/workflows/ms.synapse.privatelinkhubs.yml
+++ b/.github/workflows/ms.synapse.privatelinkhubs.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
index 99431e7f19..9882da722b 100644
--- a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
+++ b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.web.connections.yml b/.github/workflows/ms.web.connections.yml
index 0e536b7aff..d338deefb8 100644
--- a/.github/workflows/ms.web.connections.yml
+++ b/.github/workflows/ms.web.connections.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.web.hostingenvironments.yml b/.github/workflows/ms.web.hostingenvironments.yml
index 494a6cbd6e..ee740c4551 100644
--- a/.github/workflows/ms.web.hostingenvironments.yml
+++ b/.github/workflows/ms.web.hostingenvironments.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.web.serverfarms.yml b/.github/workflows/ms.web.serverfarms.yml
index 4a096c284f..b4ef90a120 100644
--- a/.github/workflows/ms.web.serverfarms.yml
+++ b/.github/workflows/ms.web.serverfarms.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.web.sites.yml b/.github/workflows/ms.web.sites.yml
index a4cce46c74..bb81fffb1e 100644
--- a/.github/workflows/ms.web.sites.yml
+++ b/.github/workflows/ms.web.sites.yml
@@ -123,7 +123,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param

From 78f04b97320ed8c5bce0794a65264d19ef57c442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Sat, 22 Jan 2022 13:05:24 +0800
Subject: [PATCH 038/121] applied condition fix

---
 .github/workflows/ms.analysisservices.servers.yml            | 5 +----
 .github/workflows/ms.apimanagement.service.yml               | 2 +-
 .github/workflows/ms.authorization.policyassignments.yml     | 2 +-
 .github/workflows/ms.authorization.policydefinitions.yml     | 2 +-
 .github/workflows/ms.authorization.policyexemptions.yml      | 2 +-
 .github/workflows/ms.authorization.policysetdefinitions.yml  | 2 +-
 .github/workflows/ms.authorization.roleassignments.yml       | 2 +-
 .github/workflows/ms.authorization.roledefinitions.yml       | 2 +-
 .github/workflows/ms.automanage.accounts.yml                 | 2 +-
 .github/workflows/ms.automation.automationaccounts.yml       | 2 +-
 .github/workflows/ms.batch.batchaccounts.yml                 | 2 +-
 .github/workflows/ms.cognitiveservices.accounts.yml          | 2 +-
 .github/workflows/ms.compute.availabilitysets.yml            | 2 +-
 .github/workflows/ms.compute.diskencryptionsets.yml          | 2 +-
 .github/workflows/ms.compute.galleries.yml                   | 2 +-
 .github/workflows/ms.compute.images.yml                      | 2 +-
 .github/workflows/ms.compute.proximityplacementgroups.yml    | 2 +-
 .github/workflows/ms.compute.virtualmachines.yml             | 2 +-
 .github/workflows/ms.compute.virtualmachinescalesets.yml     | 2 +-
 .github/workflows/ms.consumption.budgets.yml                 | 2 +-
 .github/workflows/ms.containerinstance.containergroups.yml   | 2 +-
 .github/workflows/ms.containerregistry.registries.yml        | 2 +-
 .github/workflows/ms.containerservice.managedclusters.yml    | 2 +-
 .github/workflows/ms.databricks.workspaces.yml               | 2 +-
 .github/workflows/ms.datafactory.factories.yml               | 2 +-
 .../workflows/ms.desktopvirtualization.applicationgroups.yml | 2 +-
 .github/workflows/ms.desktopvirtualization.hostpools.yml     | 2 +-
 .github/workflows/ms.desktopvirtualization.workspaces.yml    | 2 +-
 .github/workflows/ms.documentdb.databaseaccounts.yml         | 2 +-
 .github/workflows/ms.eventgrid.topics.yml                    | 2 +-
 .github/workflows/ms.eventhub.namespaces.yml                 | 2 +-
 .github/workflows/ms.healthbot.healthbots.yml                | 2 +-
 .github/workflows/ms.insights.actiongroups.yml               | 2 +-
 .github/workflows/ms.insights.activitylogalerts.yml          | 2 +-
 .github/workflows/ms.insights.components.yml                 | 2 +-
 .github/workflows/ms.insights.diagnosticsettings.yml         | 2 +-
 .github/workflows/ms.insights.metricalerts.yml               | 2 +-
 .github/workflows/ms.insights.privatelinkscopes.yml          | 2 +-
 .github/workflows/ms.insights.scheduledqueryrules.yml        | 2 +-
 .github/workflows/ms.keyvault.vaults.yml                     | 2 +-
 .github/workflows/ms.logic.workflows.yml                     | 2 +-
 .github/workflows/ms.machinelearningservices.workspaces.yml  | 2 +-
 .../workflows/ms.managedidentity.userassignedidentities.yml  | 2 +-
 .../workflows/ms.managedservices.registrationdefinitions.yml | 2 +-
 .github/workflows/ms.management.managementgroups.yml         | 2 +-
 .github/workflows/ms.netapp.netappaccounts.yml               | 2 +-
 .github/workflows/ms.network.applicationgateways.yml         | 2 +-
 .github/workflows/ms.network.applicationsecuritygroups.yml   | 2 +-
 .github/workflows/ms.network.azurefirewalls.yml              | 2 +-
 .github/workflows/ms.network.bastionhosts.yml                | 2 +-
 .github/workflows/ms.network.connections.yml                 | 2 +-
 .github/workflows/ms.network.ddosprotectionplans.yml         | 2 +-
 .github/workflows/ms.network.expressroutecircuits.yml        | 2 +-
 .github/workflows/ms.network.firewallpolicies.yml            | 2 +-
 .github/workflows/ms.network.ipgroups.yml                    | 2 +-
 .github/workflows/ms.network.loadbalancers.yml               | 2 +-
 .github/workflows/ms.network.localnetworkgateways.yml        | 2 +-
 .github/workflows/ms.network.natgateways.yml                 | 2 +-
 .github/workflows/ms.network.networksecuritygroups.yml       | 2 +-
 .github/workflows/ms.network.networkwatchers.yml             | 2 +-
 .github/workflows/ms.network.privatednszones.yml             | 2 +-
 .github/workflows/ms.network.privateendpoints.yml            | 2 +-
 .github/workflows/ms.network.publicipaddresses.yml           | 2 +-
 .github/workflows/ms.network.publicipprefixes.yml            | 2 +-
 .github/workflows/ms.network.routetables.yml                 | 2 +-
 .github/workflows/ms.network.trafficmanagerprofiles.yml      | 2 +-
 .github/workflows/ms.network.virtualnetworkgateways.yml      | 2 +-
 .github/workflows/ms.network.virtualnetworks.yml             | 2 +-
 .github/workflows/ms.network.virtualwans.yml                 | 2 +-
 .github/workflows/ms.operationalinsights.workspaces.yml      | 2 +-
 .github/workflows/ms.recoveryservices.vaults.yml             | 2 +-
 .github/workflows/ms.resources.deploymentscripts.yml         | 2 +-
 .github/workflows/ms.resources.resourcegroups.yml            | 2 +-
 .github/workflows/ms.security.azuresecuritycenter.yml        | 2 +-
 .github/workflows/ms.servicebus.namespaces.yml               | 2 +-
 .github/workflows/ms.sql.managedinstances.yml                | 2 +-
 .github/workflows/ms.sql.servers.yml                         | 2 +-
 .github/workflows/ms.storage.storageaccounts.yml             | 2 +-
 .github/workflows/ms.synapse.privatelinkhubs.yml             | 2 +-
 .github/workflows/ms.virtualmachineimages.imagetemplates.yml | 2 +-
 .github/workflows/ms.web.connections.yml                     | 2 +-
 .github/workflows/ms.web.hostingenvironments.yml             | 2 +-
 .github/workflows/ms.web.serverfarms.yml                     | 2 +-
 .github/workflows/ms.web.sites.yml                           | 2 +-
 84 files changed, 84 insertions(+), 87 deletions(-)

diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
index 678e048ed2..ac017a39bf 100644
--- a/.github/workflows/ms.analysisservices.servers.yml
+++ b/.github/workflows/ms.analysisservices.servers.yml
@@ -107,10 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: |
-      github.ref == 'refs/heads/main' ||
-      github.ref == 'refs/heads/master' ||
-      github.event.inputs.prerelease == 'true'
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.apimanagement.service.yml b/.github/workflows/ms.apimanagement.service.yml
index b9d116572e..4bfbdf3ac2 100644
--- a/.github/workflows/ms.apimanagement.service.yml
+++ b/.github/workflows/ms.apimanagement.service.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.policyassignments.yml b/.github/workflows/ms.authorization.policyassignments.yml
index 0273aafb2b..28a6574003 100644
--- a/.github/workflows/ms.authorization.policyassignments.yml
+++ b/.github/workflows/ms.authorization.policyassignments.yml
@@ -111,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.policydefinitions.yml b/.github/workflows/ms.authorization.policydefinitions.yml
index 892dc26fd8..6c1d25a414 100644
--- a/.github/workflows/ms.authorization.policydefinitions.yml
+++ b/.github/workflows/ms.authorization.policydefinitions.yml
@@ -111,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.policyexemptions.yml b/.github/workflows/ms.authorization.policyexemptions.yml
index 8297c245f9..693dd9cb13 100644
--- a/.github/workflows/ms.authorization.policyexemptions.yml
+++ b/.github/workflows/ms.authorization.policyexemptions.yml
@@ -111,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.policysetdefinitions.yml b/.github/workflows/ms.authorization.policysetdefinitions.yml
index 2b3363a374..c735576fa5 100644
--- a/.github/workflows/ms.authorization.policysetdefinitions.yml
+++ b/.github/workflows/ms.authorization.policysetdefinitions.yml
@@ -111,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.roleassignments.yml b/.github/workflows/ms.authorization.roleassignments.yml
index 7130be7930..0ec0c8e407 100644
--- a/.github/workflows/ms.authorization.roleassignments.yml
+++ b/.github/workflows/ms.authorization.roleassignments.yml
@@ -111,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.authorization.roledefinitions.yml b/.github/workflows/ms.authorization.roledefinitions.yml
index 9046e3a175..ad973a84ce 100644
--- a/.github/workflows/ms.authorization.roledefinitions.yml
+++ b/.github/workflows/ms.authorization.roledefinitions.yml
@@ -111,7 +111,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.automanage.accounts.yml b/.github/workflows/ms.automanage.accounts.yml
index 06eb79028b..e43cc5d48a 100644
--- a/.github/workflows/ms.automanage.accounts.yml
+++ b/.github/workflows/ms.automanage.accounts.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.automation.automationaccounts.yml b/.github/workflows/ms.automation.automationaccounts.yml
index d33b635323..84db0bc3af 100644
--- a/.github/workflows/ms.automation.automationaccounts.yml
+++ b/.github/workflows/ms.automation.automationaccounts.yml
@@ -108,7 +108,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.batch.batchaccounts.yml b/.github/workflows/ms.batch.batchaccounts.yml
index e27b7ee284..a09aa59648 100644
--- a/.github/workflows/ms.batch.batchaccounts.yml
+++ b/.github/workflows/ms.batch.batchaccounts.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.cognitiveservices.accounts.yml b/.github/workflows/ms.cognitiveservices.accounts.yml
index f98bf6a3a0..e159e4ef3d 100644
--- a/.github/workflows/ms.cognitiveservices.accounts.yml
+++ b/.github/workflows/ms.cognitiveservices.accounts.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.availabilitysets.yml b/.github/workflows/ms.compute.availabilitysets.yml
index cbd30a4a2d..3b663718d7 100644
--- a/.github/workflows/ms.compute.availabilitysets.yml
+++ b/.github/workflows/ms.compute.availabilitysets.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.diskencryptionsets.yml b/.github/workflows/ms.compute.diskencryptionsets.yml
index 620ddde178..7e2de1ee81 100644
--- a/.github/workflows/ms.compute.diskencryptionsets.yml
+++ b/.github/workflows/ms.compute.diskencryptionsets.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.galleries.yml b/.github/workflows/ms.compute.galleries.yml
index 2b3278b66a..595e58ce7a 100644
--- a/.github/workflows/ms.compute.galleries.yml
+++ b/.github/workflows/ms.compute.galleries.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.images.yml b/.github/workflows/ms.compute.images.yml
index 1c0eae9cfd..fc536b2673 100644
--- a/.github/workflows/ms.compute.images.yml
+++ b/.github/workflows/ms.compute.images.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.proximityplacementgroups.yml b/.github/workflows/ms.compute.proximityplacementgroups.yml
index b57939bef6..7058d23349 100644
--- a/.github/workflows/ms.compute.proximityplacementgroups.yml
+++ b/.github/workflows/ms.compute.proximityplacementgroups.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.virtualmachines.yml b/.github/workflows/ms.compute.virtualmachines.yml
index a7ff2aa82c..dc31936023 100644
--- a/.github/workflows/ms.compute.virtualmachines.yml
+++ b/.github/workflows/ms.compute.virtualmachines.yml
@@ -113,7 +113,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.compute.virtualmachinescalesets.yml b/.github/workflows/ms.compute.virtualmachinescalesets.yml
index 6f73041ed0..36d20af0b6 100644
--- a/.github/workflows/ms.compute.virtualmachinescalesets.yml
+++ b/.github/workflows/ms.compute.virtualmachinescalesets.yml
@@ -113,7 +113,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.consumption.budgets.yml b/.github/workflows/ms.consumption.budgets.yml
index 569ac7acd1..b0a219f91f 100644
--- a/.github/workflows/ms.consumption.budgets.yml
+++ b/.github/workflows/ms.consumption.budgets.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.containerinstance.containergroups.yml b/.github/workflows/ms.containerinstance.containergroups.yml
index 035f870ba2..963f3ddbf7 100644
--- a/.github/workflows/ms.containerinstance.containergroups.yml
+++ b/.github/workflows/ms.containerinstance.containergroups.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.containerregistry.registries.yml b/.github/workflows/ms.containerregistry.registries.yml
index 3135f81c3a..6f59cce4fb 100644
--- a/.github/workflows/ms.containerregistry.registries.yml
+++ b/.github/workflows/ms.containerregistry.registries.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.containerservice.managedclusters.yml b/.github/workflows/ms.containerservice.managedclusters.yml
index 8b274f4431..c9fb34f5ae 100644
--- a/.github/workflows/ms.containerservice.managedclusters.yml
+++ b/.github/workflows/ms.containerservice.managedclusters.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.databricks.workspaces.yml b/.github/workflows/ms.databricks.workspaces.yml
index e6d2728cf7..74d1de27ad 100644
--- a/.github/workflows/ms.databricks.workspaces.yml
+++ b/.github/workflows/ms.databricks.workspaces.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.datafactory.factories.yml b/.github/workflows/ms.datafactory.factories.yml
index 85a872c722..b55c6d60e3 100644
--- a/.github/workflows/ms.datafactory.factories.yml
+++ b/.github/workflows/ms.datafactory.factories.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
index f353f84c9e..ca4c4f64dd 100644
--- a/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
+++ b/.github/workflows/ms.desktopvirtualization.applicationgroups.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.desktopvirtualization.hostpools.yml b/.github/workflows/ms.desktopvirtualization.hostpools.yml
index 1d71d7d69d..9ccbb3a2c4 100644
--- a/.github/workflows/ms.desktopvirtualization.hostpools.yml
+++ b/.github/workflows/ms.desktopvirtualization.hostpools.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.desktopvirtualization.workspaces.yml b/.github/workflows/ms.desktopvirtualization.workspaces.yml
index 51a9c14925..e7aa527ecd 100644
--- a/.github/workflows/ms.desktopvirtualization.workspaces.yml
+++ b/.github/workflows/ms.desktopvirtualization.workspaces.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.documentdb.databaseaccounts.yml b/.github/workflows/ms.documentdb.databaseaccounts.yml
index 5e818fcecb..0616cdcbde 100644
--- a/.github/workflows/ms.documentdb.databaseaccounts.yml
+++ b/.github/workflows/ms.documentdb.databaseaccounts.yml
@@ -112,7 +112,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.eventgrid.topics.yml b/.github/workflows/ms.eventgrid.topics.yml
index eacdd24caa..23bf7ddbe1 100644
--- a/.github/workflows/ms.eventgrid.topics.yml
+++ b/.github/workflows/ms.eventgrid.topics.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.eventhub.namespaces.yml b/.github/workflows/ms.eventhub.namespaces.yml
index ef8e775ba0..713de6d177 100644
--- a/.github/workflows/ms.eventhub.namespaces.yml
+++ b/.github/workflows/ms.eventhub.namespaces.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.healthbot.healthbots.yml b/.github/workflows/ms.healthbot.healthbots.yml
index af4029a31d..521c601182 100644
--- a/.github/workflows/ms.healthbot.healthbots.yml
+++ b/.github/workflows/ms.healthbot.healthbots.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.actiongroups.yml b/.github/workflows/ms.insights.actiongroups.yml
index 55ab42ad21..1a56981f75 100644
--- a/.github/workflows/ms.insights.actiongroups.yml
+++ b/.github/workflows/ms.insights.actiongroups.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.activitylogalerts.yml b/.github/workflows/ms.insights.activitylogalerts.yml
index d583d70815..2c34fe890e 100644
--- a/.github/workflows/ms.insights.activitylogalerts.yml
+++ b/.github/workflows/ms.insights.activitylogalerts.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.components.yml b/.github/workflows/ms.insights.components.yml
index 5315551c2d..70448988b6 100644
--- a/.github/workflows/ms.insights.components.yml
+++ b/.github/workflows/ms.insights.components.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.diagnosticsettings.yml b/.github/workflows/ms.insights.diagnosticsettings.yml
index 6ee7e989c5..e7128c5858 100644
--- a/.github/workflows/ms.insights.diagnosticsettings.yml
+++ b/.github/workflows/ms.insights.diagnosticsettings.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.metricalerts.yml b/.github/workflows/ms.insights.metricalerts.yml
index 01782acc76..398ba58d34 100644
--- a/.github/workflows/ms.insights.metricalerts.yml
+++ b/.github/workflows/ms.insights.metricalerts.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.privatelinkscopes.yml b/.github/workflows/ms.insights.privatelinkscopes.yml
index bfa6c22222..1fd5fe78fe 100644
--- a/.github/workflows/ms.insights.privatelinkscopes.yml
+++ b/.github/workflows/ms.insights.privatelinkscopes.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.insights.scheduledqueryrules.yml b/.github/workflows/ms.insights.scheduledqueryrules.yml
index 4421e878ec..9e354c0f7c 100644
--- a/.github/workflows/ms.insights.scheduledqueryrules.yml
+++ b/.github/workflows/ms.insights.scheduledqueryrules.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.keyvault.vaults.yml b/.github/workflows/ms.keyvault.vaults.yml
index d0f10d6c85..336ae9006e 100644
--- a/.github/workflows/ms.keyvault.vaults.yml
+++ b/.github/workflows/ms.keyvault.vaults.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.logic.workflows.yml b/.github/workflows/ms.logic.workflows.yml
index c87082395d..4774a4395b 100644
--- a/.github/workflows/ms.logic.workflows.yml
+++ b/.github/workflows/ms.logic.workflows.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.machinelearningservices.workspaces.yml b/.github/workflows/ms.machinelearningservices.workspaces.yml
index d7fcb1ede4..5d4ccd0b73 100644
--- a/.github/workflows/ms.machinelearningservices.workspaces.yml
+++ b/.github/workflows/ms.machinelearningservices.workspaces.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.managedidentity.userassignedidentities.yml b/.github/workflows/ms.managedidentity.userassignedidentities.yml
index dbbd1b04ae..6c32b4da80 100644
--- a/.github/workflows/ms.managedidentity.userassignedidentities.yml
+++ b/.github/workflows/ms.managedidentity.userassignedidentities.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.managedservices.registrationdefinitions.yml b/.github/workflows/ms.managedservices.registrationdefinitions.yml
index 7599193474..1cd331149e 100644
--- a/.github/workflows/ms.managedservices.registrationdefinitions.yml
+++ b/.github/workflows/ms.managedservices.registrationdefinitions.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.management.managementgroups.yml b/.github/workflows/ms.management.managementgroups.yml
index 4dbbd63aab..4ac3476e2f 100644
--- a/.github/workflows/ms.management.managementgroups.yml
+++ b/.github/workflows/ms.management.managementgroups.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.netapp.netappaccounts.yml b/.github/workflows/ms.netapp.netappaccounts.yml
index 7f7c18b19b..a959c9ec70 100644
--- a/.github/workflows/ms.netapp.netappaccounts.yml
+++ b/.github/workflows/ms.netapp.netappaccounts.yml
@@ -112,7 +112,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.applicationgateways.yml b/.github/workflows/ms.network.applicationgateways.yml
index 86bb80072f..ee4778c172 100644
--- a/.github/workflows/ms.network.applicationgateways.yml
+++ b/.github/workflows/ms.network.applicationgateways.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.applicationsecuritygroups.yml b/.github/workflows/ms.network.applicationsecuritygroups.yml
index e9fb89043c..8f8c1efb6f 100644
--- a/.github/workflows/ms.network.applicationsecuritygroups.yml
+++ b/.github/workflows/ms.network.applicationsecuritygroups.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.azurefirewalls.yml b/.github/workflows/ms.network.azurefirewalls.yml
index 1cc8c9e65a..a92d57d960 100644
--- a/.github/workflows/ms.network.azurefirewalls.yml
+++ b/.github/workflows/ms.network.azurefirewalls.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.bastionhosts.yml b/.github/workflows/ms.network.bastionhosts.yml
index 62adfb12c9..bccc7fd751 100644
--- a/.github/workflows/ms.network.bastionhosts.yml
+++ b/.github/workflows/ms.network.bastionhosts.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.connections.yml b/.github/workflows/ms.network.connections.yml
index e328c50955..419fa19daa 100644
--- a/.github/workflows/ms.network.connections.yml
+++ b/.github/workflows/ms.network.connections.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.ddosprotectionplans.yml b/.github/workflows/ms.network.ddosprotectionplans.yml
index d989657772..316f4ac30e 100644
--- a/.github/workflows/ms.network.ddosprotectionplans.yml
+++ b/.github/workflows/ms.network.ddosprotectionplans.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.expressroutecircuits.yml b/.github/workflows/ms.network.expressroutecircuits.yml
index 7986a2258d..7a74caa261 100644
--- a/.github/workflows/ms.network.expressroutecircuits.yml
+++ b/.github/workflows/ms.network.expressroutecircuits.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.firewallpolicies.yml b/.github/workflows/ms.network.firewallpolicies.yml
index 5ec28420f2..a5d24014d3 100644
--- a/.github/workflows/ms.network.firewallpolicies.yml
+++ b/.github/workflows/ms.network.firewallpolicies.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.ipgroups.yml b/.github/workflows/ms.network.ipgroups.yml
index abce9d0c41..3568b4ee39 100644
--- a/.github/workflows/ms.network.ipgroups.yml
+++ b/.github/workflows/ms.network.ipgroups.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.loadbalancers.yml b/.github/workflows/ms.network.loadbalancers.yml
index 073ad490e2..642ede2ffa 100644
--- a/.github/workflows/ms.network.loadbalancers.yml
+++ b/.github/workflows/ms.network.loadbalancers.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.localnetworkgateways.yml b/.github/workflows/ms.network.localnetworkgateways.yml
index de6a1dc3ae..57056b498e 100644
--- a/.github/workflows/ms.network.localnetworkgateways.yml
+++ b/.github/workflows/ms.network.localnetworkgateways.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.natgateways.yml b/.github/workflows/ms.network.natgateways.yml
index 46c2c37e52..b4cadf0618 100644
--- a/.github/workflows/ms.network.natgateways.yml
+++ b/.github/workflows/ms.network.natgateways.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.networksecuritygroups.yml b/.github/workflows/ms.network.networksecuritygroups.yml
index 31e2c61c1e..09783cd6c8 100644
--- a/.github/workflows/ms.network.networksecuritygroups.yml
+++ b/.github/workflows/ms.network.networksecuritygroups.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.networkwatchers.yml b/.github/workflows/ms.network.networkwatchers.yml
index 206cca04f7..dcb7778cee 100644
--- a/.github/workflows/ms.network.networkwatchers.yml
+++ b/.github/workflows/ms.network.networkwatchers.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.privatednszones.yml b/.github/workflows/ms.network.privatednszones.yml
index 2977451fc9..e6c6447807 100644
--- a/.github/workflows/ms.network.privatednszones.yml
+++ b/.github/workflows/ms.network.privatednszones.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.privateendpoints.yml b/.github/workflows/ms.network.privateendpoints.yml
index 5c4dd36e7b..0efb2b3d7a 100644
--- a/.github/workflows/ms.network.privateendpoints.yml
+++ b/.github/workflows/ms.network.privateendpoints.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.publicipaddresses.yml b/.github/workflows/ms.network.publicipaddresses.yml
index 7060fdd70b..e6b07c53f1 100644
--- a/.github/workflows/ms.network.publicipaddresses.yml
+++ b/.github/workflows/ms.network.publicipaddresses.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.publicipprefixes.yml b/.github/workflows/ms.network.publicipprefixes.yml
index 562893755b..032629dc7e 100644
--- a/.github/workflows/ms.network.publicipprefixes.yml
+++ b/.github/workflows/ms.network.publicipprefixes.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.routetables.yml b/.github/workflows/ms.network.routetables.yml
index 76d4d9de24..7a8dda12bf 100644
--- a/.github/workflows/ms.network.routetables.yml
+++ b/.github/workflows/ms.network.routetables.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.trafficmanagerprofiles.yml b/.github/workflows/ms.network.trafficmanagerprofiles.yml
index fd0675ccc3..c896688b95 100644
--- a/.github/workflows/ms.network.trafficmanagerprofiles.yml
+++ b/.github/workflows/ms.network.trafficmanagerprofiles.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.virtualnetworkgateways.yml b/.github/workflows/ms.network.virtualnetworkgateways.yml
index 7fa900f995..13f7bf097f 100644
--- a/.github/workflows/ms.network.virtualnetworkgateways.yml
+++ b/.github/workflows/ms.network.virtualnetworkgateways.yml
@@ -108,7 +108,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.virtualnetworks.yml b/.github/workflows/ms.network.virtualnetworks.yml
index d5597771c4..6948c2ceae 100644
--- a/.github/workflows/ms.network.virtualnetworks.yml
+++ b/.github/workflows/ms.network.virtualnetworks.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.network.virtualwans.yml b/.github/workflows/ms.network.virtualwans.yml
index 1528b599e8..86c65930ee 100644
--- a/.github/workflows/ms.network.virtualwans.yml
+++ b/.github/workflows/ms.network.virtualwans.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.operationalinsights.workspaces.yml b/.github/workflows/ms.operationalinsights.workspaces.yml
index 2750e7d132..501268b96d 100644
--- a/.github/workflows/ms.operationalinsights.workspaces.yml
+++ b/.github/workflows/ms.operationalinsights.workspaces.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.recoveryservices.vaults.yml b/.github/workflows/ms.recoveryservices.vaults.yml
index e261aec6ae..9cdd7b3465 100644
--- a/.github/workflows/ms.recoveryservices.vaults.yml
+++ b/.github/workflows/ms.recoveryservices.vaults.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.resources.deploymentscripts.yml b/.github/workflows/ms.resources.deploymentscripts.yml
index 612f875bd3..7ae8b61fb9 100644
--- a/.github/workflows/ms.resources.deploymentscripts.yml
+++ b/.github/workflows/ms.resources.deploymentscripts.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.resources.resourcegroups.yml b/.github/workflows/ms.resources.resourcegroups.yml
index f5361f51d3..dcb96514c4 100644
--- a/.github/workflows/ms.resources.resourcegroups.yml
+++ b/.github/workflows/ms.resources.resourcegroups.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.security.azuresecuritycenter.yml b/.github/workflows/ms.security.azuresecuritycenter.yml
index 89239fcce8..b96384e6dc 100644
--- a/.github/workflows/ms.security.azuresecuritycenter.yml
+++ b/.github/workflows/ms.security.azuresecuritycenter.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.servicebus.namespaces.yml b/.github/workflows/ms.servicebus.namespaces.yml
index 02d8eeb4c4..25911e7513 100644
--- a/.github/workflows/ms.servicebus.namespaces.yml
+++ b/.github/workflows/ms.servicebus.namespaces.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.sql.managedinstances.yml b/.github/workflows/ms.sql.managedinstances.yml
index 63e2daeb9d..00dd9b0255 100644
--- a/.github/workflows/ms.sql.managedinstances.yml
+++ b/.github/workflows/ms.sql.managedinstances.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.sql.servers.yml b/.github/workflows/ms.sql.servers.yml
index f6913a8aad..749ed80d6e 100644
--- a/.github/workflows/ms.sql.servers.yml
+++ b/.github/workflows/ms.sql.servers.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.storage.storageaccounts.yml b/.github/workflows/ms.storage.storageaccounts.yml
index b885d6b004..2ca3088f70 100644
--- a/.github/workflows/ms.storage.storageaccounts.yml
+++ b/.github/workflows/ms.storage.storageaccounts.yml
@@ -108,7 +108,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.synapse.privatelinkhubs.yml b/.github/workflows/ms.synapse.privatelinkhubs.yml
index 85a7334ec9..fb7c311171 100644
--- a/.github/workflows/ms.synapse.privatelinkhubs.yml
+++ b/.github/workflows/ms.synapse.privatelinkhubs.yml
@@ -117,7 +117,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref)
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
index 02f4aa3679..a83697906c 100644
--- a/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
+++ b/.github/workflows/ms.virtualmachineimages.imagetemplates.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.web.connections.yml b/.github/workflows/ms.web.connections.yml
index ef59535637..0854e8b189 100644
--- a/.github/workflows/ms.web.connections.yml
+++ b/.github/workflows/ms.web.connections.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.web.hostingenvironments.yml b/.github/workflows/ms.web.hostingenvironments.yml
index 912a9b38f0..cbfd40f6fa 100644
--- a/.github/workflows/ms.web.hostingenvironments.yml
+++ b/.github/workflows/ms.web.hostingenvironments.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.web.serverfarms.yml b/.github/workflows/ms.web.serverfarms.yml
index 14f4af124c..2aac361b0a 100644
--- a/.github/workflows/ms.web.serverfarms.yml
+++ b/.github/workflows/ms.web.serverfarms.yml
@@ -107,7 +107,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param
diff --git a/.github/workflows/ms.web.sites.yml b/.github/workflows/ms.web.sites.yml
index df3fefffa8..53f414439e 100644
--- a/.github/workflows/ms.web.sites.yml
+++ b/.github/workflows/ms.web.sites.yml
@@ -113,7 +113,7 @@ jobs:
   ###############
   job_publish_module:
     name: 'Publish module'
-    if: contains(fromJson('["refs/heads/main", "refs/heads/master"]'), github.ref) || ('${{ github.event.inputs.prerelease }}' == 'true')
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true' || ('${{ github.event.inputs.prerelease }}' == 'true')
     runs-on: ubuntu-20.04
     needs:
       - job_set_workflow_param

From b4ee985ca2a94e174bf7f17e0990d1d11fe15f58 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 13:08:24 +0100
Subject: [PATCH 039/121] Update new workflow files with correct inputs

---
 .../workflows/ms.network.firewallpolicies.yml | 18 ++++--------------
 .../workflows/ms.synapse.privatelinkhubs.yml  | 19 +++++--------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/ms.network.firewallpolicies.yml b/.github/workflows/ms.network.firewallpolicies.yml
index a5d24014d3..a75b188ce2 100644
--- a/.github/workflows/ms.network.firewallpolicies.yml
+++ b/.github/workflows/ms.network.firewallpolicies.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -135,8 +127,6 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
diff --git a/.github/workflows/ms.synapse.privatelinkhubs.yml b/.github/workflows/ms.synapse.privatelinkhubs.yml
index fb7c311171..6a2a083f65 100644
--- a/.github/workflows/ms.synapse.privatelinkhubs.yml
+++ b/.github/workflows/ms.synapse.privatelinkhubs.yml
@@ -8,19 +8,11 @@ on:
         description: 'Remove deployed module'
         required: false
         default: 'true'
-      versioningOption:
-        type: choice
-        description: 'The mode to handle the version increments [major|minor|patch]'
-        required: false
-        default: 'patch'
-        options:
-          - major
-          - minor
-          - patch
-      customVersion:
-        description: 'Custom version to apply. Used only if higher than latest'
+      prerelease:
+        type: boolean
+        description: 'Publish prerelease module'
         required: false
-        default: '0.0.1'
+        default: 'false'
   push:
     branches:
       - main
@@ -135,12 +127,11 @@ jobs:
         uses: ./.github/actions/templates/publishModule
         with:
           templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          versioningOption: '${{ needs.job_set_workflow_param.outputs.versioningOption }}'
-          customVersion: '${{ needs.job_set_workflow_param.outputs.customVersion }}'
           templateSpecsRGName: '${{ env.templateSpecsRGName }}'
           templateSpecsRGLocation: '${{ env.templateSpecsRGLocation }}'
           templateSpecsDescription: '${{ env.templateSpecsDescription }}'
           templateSpecsDoPublish: '${{ env.templateSpecsDoPublish }}'
           bicepRegistryName: '${{ env.bicepRegistryName }}'
           bicepRegistryRGName: '${{ env.bicepRegistryRGName }}'
+          bicepRegistryRgLocation: '${{ env.bicepRegistryRgLocation }}'
           bicepRegistryDoPublish: '${{ env.bicepRegistryDoPublish }}'

From c2b4feaa54b87f2bfc9e2fd5b723234b3443a2e0 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 13:08:44 +0100
Subject: [PATCH 040/121] Cleanup comments on action

---
 .github/actions/templates/publishModule/action.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 01f723670d..839860dd85 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -61,8 +61,6 @@ runs:
       shell: pwsh
       if: ${{ inputs.templateSpecsDoPublish == 'true' }}
       run: |
-        # Workaround until composite actions support conditions
-        # Once available, remove this if and enable the step condition
         # Load used functions
         . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
         . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
@@ -97,8 +95,6 @@ runs:
       shell: pwsh
       if: ${{ inputs.bicepRegistryDoPublish == 'true' }}
       run: |
-        # Workaround until composite actions support conditions
-        # Once available, remove this if and enable the step condition
         # Load used functions
         . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
         . (Join-Path $env:GITHUB_WORKSPACE 'utilities' 'pipelines' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')

From 4612f367e0d5811203dac05f5b1b75b34d795e67 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 13:32:11 +0100
Subject: [PATCH 041/121] Added missing version files

---
 .../firewallPolicies/ruleCollectionGroups/version.json        | 4 ++++
 .../firewallPolicies/ruleGroups/version.json                  | 4 ++++
 arm/Microsoft.Network/firewallPolicies/version.json           | 4 ++++
 .../loadBalancers/backendAddressPools/version.json            | 4 ++++
 .../loadBalancers/inboundNatRules/version.json                | 4 ++++
 arm/Microsoft.Network/virtualNetworks/subnets/version.json    | 4 ++++
 .../vaults/backupConfig/version.json                          | 4 ++++
 arm/Microsoft.Synapse/privateLinkHubs/version.json            | 4 ++++
 8 files changed, 32 insertions(+)
 create mode 100644 arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
 create mode 100644 arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json
 create mode 100644 arm/Microsoft.Network/firewallPolicies/version.json
 create mode 100644 arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json
 create mode 100644 arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json
 create mode 100644 arm/Microsoft.Network/virtualNetworks/subnets/version.json
 create mode 100644 arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json
 create mode 100644 arm/Microsoft.Synapse/privateLinkHubs/version.json

diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json b/arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/firewallPolicies/version.json b/arm/Microsoft.Network/firewallPolicies/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/firewallPolicies/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json b/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json b/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/version.json b/arm/Microsoft.Network/virtualNetworks/subnets/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Network/virtualNetworks/subnets/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json b/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/version.json b/arm/Microsoft.Synapse/privateLinkHubs/version.json
new file mode 100644
index 0000000000..08ec8d7491
--- /dev/null
+++ b/arm/Microsoft.Synapse/privateLinkHubs/version.json
@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
+    "version": "0.3"
+}

From 767a41d3e0ab11b82e670fdb4c4e9bb072a045a4 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 13:38:05 +0100
Subject: [PATCH 042/121] Conform to PowerShell Best Practice

---
 .../templates/publishModule/action.yml        | 10 +++++-----
 .../Publish-ModuleToPrivateBicepRegistry.ps1  | 20 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/actions/templates/publishModule/action.yml b/.github/actions/templates/publishModule/action.yml
index 839860dd85..3610e9c40c 100644
--- a/.github/actions/templates/publishModule/action.yml
+++ b/.github/actions/templates/publishModule/action.yml
@@ -78,10 +78,10 @@ runs:
         # Publish the modified child resources
         foreach ($ModuleToUpdate in $ModulesToUpdate) {
           $functionInput = @{
-            templateFilePath         = $ModuleToUpdate.TemplateFilePath
-            templateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
-            templateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
-            templateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
+            TemplateFilePath         = $ModuleToUpdate.TemplateFilePath
+            TemplateSpecsRgName      = '${{ inputs.templateSpecsRgName }}'
+            TemplateSpecsRgLocation  = '${{ inputs.templateSpecsRgLocation }}'
+            TemplateSpecsDescription = '${{ inputs.templateSpecsDescription }}'
             ModuleVersion            = $ModuleToUpdate.Version
           }
 
@@ -115,7 +115,7 @@ runs:
             TemplateFilePath        = $ModuleToUpdate.TemplateFilePath
             BicepRegistryName       = '${{ inputs.bicepRegistryName }}'
             BicepRegistryRgName     = '${{ inputs.bicepRegistryRgName }}'
-            bicepRegistryRgLocation = '${{ inputs.bicepRegistryRgLocation }}'
+            BicepRegistryRgLocation = '${{ inputs.bicepRegistryRgLocation }}'
             ModuleVersion           = $ModuleToUpdate.Version
           }
 
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index 573518f112..30ee38a421 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -14,12 +14,12 @@ Mandatory. Name of the private bicep registry to publish to.
 .PARAMETER BicepRegistryRgName
 Mandatory. ResourceGroup of the private bicep registry to publish to.
 
+.PARAMETER BicepRegistryRgLocation
+Optional. The location of the resourceGroup the private bicep registry is deployed to. Required if the resource group is not yet existing.
+
 .PARAMETER ModuleVersion
 Required. Version of the module to publish.
 
-.PARAMETER bicepRegistryRgLocation
-Optional. The location of the resourceGroup the private bicep registry is deployed to. Required if the resource group is not yet existing.
-
 .EXAMPLE
 Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:/KeyVault/deploy.json' -BicepRegistryRgName 'artifacts-rg' -ModuleVersion '3.0.0-alpha'
 
@@ -32,14 +32,14 @@ function Publish-ModuleToPrivateBicepRegistry {
         [Parameter(Mandatory)]
         [string] $TemplateFilePath,
 
+        [Parameter(Mandatory)]
+        [string] $BicepRegistryName,
+
         [Parameter(Mandatory)]
         [string] $BicepRegistryRgName,
 
         [Parameter(Mandatory = $false)]
-        [string] $bicepRegistryRgLocation,
-
-        [Parameter(Mandatory)]
-        [string] $BicepRegistryName,
+        [string] $BicepRegistryRgLocation,
 
         [Parameter(Mandatory)]
         [string] $ModuleVersion
@@ -58,9 +58,9 @@ function Publish-ModuleToPrivateBicepRegistry {
         }
 
         # Resource Group
-        if (-not (Get-AzResourceGroup -Name $bicepRegistryRgName -ErrorAction 'SilentlyContinue')) {
-            if ($PSCmdlet.ShouldProcess("Resource group [$bicepRegistryRgName] to location [$bicepRegistryRgLocation]", 'Deploy')) {
-                New-AzResourceGroup -Name $bicepRegistryRgName -Location $bicepRegistryRgLocation
+        if (-not (Get-AzResourceGroup -Name $BicepRegistryRgName -ErrorAction 'SilentlyContinue')) {
+            if ($PSCmdlet.ShouldProcess("Resource group [$BicepRegistryRgName] to location [$BicepRegistryRgLocation]", 'Deploy')) {
+                New-AzResourceGroup -Name $BicepRegistryRgName -Location $BicepRegistryRgLocation
             }
         }
 

From e9c24e99c288b0d4bbda585619f791411343e2a5 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 13:38:29 +0100
Subject: [PATCH 043/121] Clean code - function name update for more clarity

---
 .../pipelines/resourcePublish/Get-ModulesToUpdate.ps1     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 5a534c80a7..71a76cbc22 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -233,7 +233,7 @@ function Get-GitDistance {
 
 <#
 .SYNOPSIS
-Gets the version file from the corresponding deploy.bicep/json file.
+Gets the version from the version file from the corresponding deploy.bicep/json file.
 
 .DESCRIPTION
 Gets the version file from the corresponding deploy.bicep/json file.
@@ -243,13 +243,13 @@ The file needs to be in the same folder as the template file itself.
 Path to a deploy.bicep/json file.
 
 .EXAMPLE
-Get-ModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
 
 0.3
 
 Get the version file from the specified deploy.bicep file.
 #>
-function Get-ModuleVersion {
+function Get-ModuleVersionFromFile {
 
     [CmdletBinding()]
     param (
@@ -296,7 +296,7 @@ function Get-NewModuleVersion {
         [string] $TemplateFilePath
     )
 
-    $Version = Get-ModuleVersion -TemplateFilePath $TemplateFilePath
+    $Version = Get-ModuleVersionFromFile -TemplateFilePath $TemplateFilePath
     $Patch = Get-GitDistance
     $NewVersion = "$Version.$Patch"
 

From 81888da064df0fff51733bb798b3ef461d87a781 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 13:40:03 +0100
Subject: [PATCH 044/121] typo

---
 .azuredevops/pipelineTemplates/module.jobs.validate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azuredevops/pipelineTemplates/module.jobs.validate.yml b/.azuredevops/pipelineTemplates/module.jobs.validate.yml
index ff45280b39..288ff4416d 100644
--- a/.azuredevops/pipelineTemplates/module.jobs.validate.yml
+++ b/.azuredevops/pipelineTemplates/module.jobs.validate.yml
@@ -2,7 +2,7 @@
 ## VALIDATION PIPELINE                                 ##
 #########################################################
 ##
-## This pipeline template contains the logic to validate a given modue's ARM template using the provided parameter file(s)
+## This pipeline template contains the logic to validate a given module's ARM template using the provided parameter file(s)
 ##
 ## Enabled levels of validation
 ## - Resource-Group-Level

From 27fc9841067250428513c4e9440441a1a9d8e4d5 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 13:40:25 +0100
Subject: [PATCH 045/121] typo

---
 .azuredevops/pipelineTemplates/module.jobs.publish.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azuredevops/pipelineTemplates/module.jobs.publish.yml b/.azuredevops/pipelineTemplates/module.jobs.publish.yml
index 2d4e014332..96d549e2b7 100644
--- a/.azuredevops/pipelineTemplates/module.jobs.publish.yml
+++ b/.azuredevops/pipelineTemplates/module.jobs.publish.yml
@@ -14,7 +14,7 @@
 ##---------------------------------------------##
 ##
 ## By default it uses the variables specified in the below [parameters] section. However, you can overwrite these variables in the
-##    referencing pipeline by providing the paramater explicitly.
+##    referencing pipeline by providing the parameter explicitly.
 ##
 ## NOTE: If you don't need to overwrite a shared value, you can IGNORE this section
 ##

From feeb52585e838f09988daa720b6a6f18c6d85ebf Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 15:32:48 +0100
Subject: [PATCH 046/121] Updated TS + BR publishing on ADO pipelines

---
 .../ms.analysisservices.servers.yml           | 23 ++------
 .../ms.apimanagement.service.yml              | 23 ++------
 .../ms.authorization.policyassignments.yml    | 23 ++------
 .../ms.authorization.policydefinitions.yml    | 23 ++------
 .../ms.authorization.policyexemptions.yml     | 23 ++------
 .../ms.authorization.policysetdefinitions.yml | 23 ++------
 .../ms.authorization.roleassignments.yml      | 23 ++------
 .../ms.authorization.roledefinitions.yml      | 23 ++------
 .../ms.automanage.accounts.yml                | 23 ++------
 .../ms.automation.automationaccounts.yml      | 23 ++------
 .../ms.batch.batchaccounts.yml                | 23 ++------
 .../ms.cognitiveservices.accounts.yml         | 23 ++------
 .../ms.compute.availabilitysets.yml           | 23 ++------
 .../ms.compute.diskencryptionsets.yml         | 23 ++------
 .../modulePipelines/ms.compute.galleries.yml  | 23 ++------
 .../modulePipelines/ms.compute.images.yml     | 23 ++------
 .../ms.compute.proximityplacementgroups.yml   | 23 ++------
 .../ms.compute.virtualmachines.yml            | 23 ++------
 .../ms.compute.virtualmachinescalesets.yml    | 23 ++------
 .../ms.consumption.budgets.yml                | 23 ++------
 .../ms.containerinstance.containergroups.yml  | 23 ++------
 .../ms.containerregistry.registries.yml       | 23 ++------
 .../ms.containerservice.managedclusters.yml   | 23 ++------
 .../ms.databricks.workspaces.yml              | 23 ++------
 .../ms.datafactory.factories.yml              | 23 ++------
 ...esktopvirtualization.applicationgroups.yml | 23 ++------
 .../ms.desktopvirtualization.hostpools.yml    | 23 ++------
 .../ms.desktopvirtualization.workspaces.yml   | 23 ++------
 .../ms.documentdb.databaseaccounts.yml        | 23 ++------
 .../modulePipelines/ms.eventgrid.topics.yml   | 23 ++------
 .../ms.eventhub.namespaces.yml                | 23 ++------
 .../ms.healthbot.healthbots.yml               | 23 ++------
 .../ms.insights.actiongroups.yml              | 23 ++------
 .../ms.insights.activitylogalerts.yml         | 23 ++------
 .../ms.insights.components.yml                | 23 ++------
 .../ms.insights.diagnosticsettings.yml        | 23 ++------
 .../ms.insights.metricalerts.yml              | 23 ++------
 .../ms.insights.privatelinkscopes.yml         | 23 ++------
 .../ms.insights.scheduledqueryrules.yml       | 23 ++------
 .../modulePipelines/ms.keyvault.vaults.yml    | 23 ++------
 .../modulePipelines/ms.logic.workflows.yml    | 23 ++------
 .../ms.machinelearningservices.workspaces.yml | 23 ++------
 ...managedidentity.userassignedidentities.yml | 23 ++------
 ...anagedservices.registrationdefinitions.yml | 23 ++------
 .../ms.management.managementgroups.yml        | 23 ++------
 .../ms.netapp.netappaccounts.yml              | 23 ++------
 .../ms.network.applicationgateways.yml        | 23 ++------
 .../ms.network.applicationsecuritygroups.yml  | 23 ++------
 .../ms.network.azurefirewalls.yml             | 23 ++------
 .../ms.network.bastionhosts.yml               | 23 ++------
 .../ms.network.connections.yml                | 23 ++------
 .../ms.network.ddosprotectionplans.yml        | 23 ++------
 .../ms.network.expressroutecircuits.yml       | 23 ++------
 .../modulePipelines/ms.network.ipgroups.yml   | 23 ++------
 .../ms.network.loadbalancers.yml              | 23 ++------
 .../ms.network.localnetworkgateways.yml       | 23 ++------
 .../ms.network.natgateways.yml                | 23 ++------
 .../ms.network.networksecuritygroups.yml      | 23 ++------
 .../ms.network.networkwatchers.yml            | 23 ++------
 .../ms.network.privatednszones.yml            | 23 ++------
 .../ms.network.privateendpoints.yml           | 23 ++------
 .../ms.network.publicipaddresses.yml          | 23 ++------
 .../ms.network.publicipprefixes.yml           | 23 ++------
 .../ms.network.routetables.yml                | 23 ++------
 .../ms.network.trafficmanagerprofiles.yml     | 23 ++------
 .../ms.network.virtualnetworkgateways.yml     | 23 ++------
 .../ms.network.virtualnetworks.yml            | 23 ++------
 .../ms.network.virtualwans.yml                | 23 ++------
 .../ms.operationalinsights.workspaces.yml     | 23 ++------
 .../ms.recoveryservices.vaults.yml            | 23 ++------
 .../ms.resources.deploymentscripts.yml        | 23 ++------
 .../ms.resources.resourcegroups.yml           | 23 ++------
 .../ms.security.azuresecuritycenter.yml       | 23 ++------
 .../ms.servicebus.namespaces.yml              | 23 ++------
 .../ms.sql.managedinstances.yml               | 23 ++------
 .../modulePipelines/ms.sql.servers.yml        | 23 ++------
 .../ms.storage.storageaccounts.yml            | 23 ++------
 .../ms.synapse.privatelinkhubs.yml            | 23 ++------
 ...ms.virtualmachineimages.imagetemplates.yml | 23 ++------
 .../modulePipelines/ms.web.connections.yml    | 23 ++------
 .../ms.web.hostingenvironments.yml            | 23 ++------
 .../modulePipelines/ms.web.serverfarms.yml    | 23 ++------
 .azuredevops/modulePipelines/ms.web.sites.yml | 23 ++------
 .../pipelineTemplates/module.jobs.publish.yml | 58 +++++++++++++------
 84 files changed, 538 insertions(+), 1429 deletions(-)

diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
index 395a1dba9e..b92544b7bb 100644
--- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
+++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.apimanagement.service.yml b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
index 8ac3f37524..f061fd56d2 100644
--- a/.azuredevops/modulePipelines/ms.apimanagement.service.yml
+++ b/.azuredevops/modulePipelines/ms.apimanagement.service.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Soft-delete prevents re-deployment
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
index d47eff7e36..fbc519c7fc 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyassignments.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
index 8f2d84e1dd..f61678b7bd 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policydefinitions.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
index 265f983858..d899c2fb53 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policyexemptions.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
index 07dc74c22c..8a79e4c735 100644
--- a/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.policysetdefinitions.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
index a3477c6486..e1993b4c41 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roleassignments.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
index fab720300f..c1f615cff0 100644
--- a/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.authorization.roledefinitions.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.automanage.accounts.yml b/.azuredevops/modulePipelines/ms.automanage.accounts.yml
index 497a50862a..a0fb21b037 100644
--- a/.azuredevops/modulePipelines/ms.automanage.accounts.yml
+++ b/.azuredevops/modulePipelines/ms.automanage.accounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
index 008122b18c..5501d74d71 100644
--- a/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.automation.automationaccounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
index 11b941d728..8ce27729ea 100644
--- a/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.batch.batchaccounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
index 496e51d831..24ca333700 100644
--- a/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
+++ b/.azuredevops/modulePipelines/ms.cognitiveservices.accounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Soft-delete prevents re-deployment
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
index 1ea2b813b9..9441dc151d 100644
--- a/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.availabilitysets.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
index 4d705857e9..03eccf2084 100644
--- a/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.diskencryptionsets.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.compute.galleries.yml b/.azuredevops/modulePipelines/ms.compute.galleries.yml
index d6b94e0376..c16dcdb45b 100644
--- a/.azuredevops/modulePipelines/ms.compute.galleries.yml
+++ b/.azuredevops/modulePipelines/ms.compute.galleries.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -59,9 +51,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.compute.images.yml b/.azuredevops/modulePipelines/ms.compute.images.yml
index d721278918..51f761eb2b 100644
--- a/.azuredevops/modulePipelines/ms.compute.images.yml
+++ b/.azuredevops/modulePipelines/ms.compute.images.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
index 6a663f3453..b8dfc1c59e 100644
--- a/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.compute.proximityplacementgroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
index efb4901bc2..9fe0a98293 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachines.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
index 3ec6809b5b..84a9c50c75 100644
--- a/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
+++ b/.azuredevops/modulePipelines/ms.compute.virtualmachinescalesets.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.consumption.budgets.yml b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
index 0388e01409..af11636810 100644
--- a/.azuredevops/modulePipelines/ms.consumption.budgets.yml
+++ b/.azuredevops/modulePipelines/ms.consumption.budgets.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
index 49b2450976..01210ea38f 100644
--- a/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
+++ b/.azuredevops/modulePipelines/ms.containerinstance.containergroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
index 2bf0feccc4..fbf4fe0d79 100644
--- a/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
+++ b/.azuredevops/modulePipelines/ms.containerregistry.registries.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
index bfece1d9ac..98927767d1 100644
--- a/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
+++ b/.azuredevops/modulePipelines/ms.containerservice.managedclusters.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
index e1b51111f2..db4f660070 100644
--- a/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.databricks.workspaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.datafactory.factories.yml b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
index 877c4b2e2a..b73116270d 100644
--- a/.azuredevops/modulePipelines/ms.datafactory.factories.yml
+++ b/.azuredevops/modulePipelines/ms.datafactory.factories.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
index 1a62e00938..ea6038ec5d 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.applicationgroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
index afa83c614b..c1a96408a8 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.hostpools.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
index fce79b94e2..7cfc17cb57 100644
--- a/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.desktopvirtualization.workspaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
index 2f7efad7d0..a7259a1016 100644
--- a/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.documentdb.databaseaccounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -56,9 +48,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
index 08e4c8995e..5881738560 100644
--- a/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
+++ b/.azuredevops/modulePipelines/ms.eventgrid.topics.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
index 2262d57a9d..e1e9def70e 100644
--- a/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.eventhub.namespaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
index d9fa80f662..4259ce51df 100644
--- a/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
+++ b/.azuredevops/modulePipelines/ms.healthbot.healthbots.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
index d767074fd3..7d317709cf 100644
--- a/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
+++ b/.azuredevops/modulePipelines/ms.insights.actiongroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
index cad6376c0d..48f6efa020 100644
--- a/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.activitylogalerts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.insights.components.yml b/.azuredevops/modulePipelines/ms.insights.components.yml
index d7edf12ba9..58cbe85f10 100644
--- a/.azuredevops/modulePipelines/ms.insights.components.yml
+++ b/.azuredevops/modulePipelines/ms.insights.components.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
index f6479273be..aec54ea576 100644
--- a/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
+++ b/.azuredevops/modulePipelines/ms.insights.diagnosticsettings.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Needs custom removals script
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
index 6ba264ce34..2702a0ad48 100644
--- a/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
+++ b/.azuredevops/modulePipelines/ms.insights.metricalerts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
index a86205bf4e..11875d0bb3 100644
--- a/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
+++ b/.azuredevops/modulePipelines/ms.insights.privatelinkscopes.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
index 213d90ad53..560421203a 100644
--- a/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
+++ b/.azuredevops/modulePipelines/ms.insights.scheduledqueryrules.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
index 0ac1346c69..94a3cfd496 100644
--- a/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.keyvault.vaults.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Soft-delete prevents re-deployment
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.logic.workflows.yml b/.azuredevops/modulePipelines/ms.logic.workflows.yml
index 64efe446b9..9511f18330 100644
--- a/.azuredevops/modulePipelines/ms.logic.workflows.yml
+++ b/.azuredevops/modulePipelines/ms.logic.workflows.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
index 0e6dcff465..5ca28ed084 100644
--- a/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.machinelearningservices.workspaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
index 2f8f5c2378..2fb42d1802 100644
--- a/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
+++ b/.azuredevops/modulePipelines/ms.managedidentity.userassignedidentities.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
index 882de3b1ea..58311aaa42 100644
--- a/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
+++ b/.azuredevops/modulePipelines/ms.managedservices.registrationdefinitions.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Needs a custom removal script
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.management.managementgroups.yml b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
index 007a7ea0ed..ba37331d4a 100644
--- a/.azuredevops/modulePipelines/ms.management.managementgroups.yml
+++ b/.azuredevops/modulePipelines/ms.management.managementgroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Deployment does not support tags
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
index 555516b59b..d82d2d03e0 100644
--- a/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.netapp.netappaccounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -56,9 +48,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
index c77531065d..f5198d6351 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationgateways.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
index 0a77c78142..b8cd243387 100644
--- a/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.applicationsecuritygroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
index eec3c3e2ee..7c522207c6 100644
--- a/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
+++ b/.azuredevops/modulePipelines/ms.network.azurefirewalls.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
index 0d005a2e32..7bf6ebb8d2 100644
--- a/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
+++ b/.azuredevops/modulePipelines/ms.network.bastionhosts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.connections.yml b/.azuredevops/modulePipelines/ms.network.connections.yml
index e7e5ac3afd..a0d30a8cc5 100644
--- a/.azuredevops/modulePipelines/ms.network.connections.yml
+++ b/.azuredevops/modulePipelines/ms.network.connections.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
index e55bca2a98..69a01a2047 100644
--- a/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
+++ b/.azuredevops/modulePipelines/ms.network.ddosprotectionplans.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
index cef1ccdcee..91b3ede11e 100644
--- a/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
+++ b/.azuredevops/modulePipelines/ms.network.expressroutecircuits.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.ipgroups.yml b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
index 7538f14d2d..b222681724 100644
--- a/.azuredevops/modulePipelines/ms.network.ipgroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.ipgroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
index 29abbe76ae..0c0374c47a 100644
--- a/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
+++ b/.azuredevops/modulePipelines/ms.network.loadbalancers.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
index fc981ac91a..74cd14fc7a 100644
--- a/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.localnetworkgateways.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.natgateways.yml b/.azuredevops/modulePipelines/ms.network.natgateways.yml
index adb71c15ea..1880405b4c 100644
--- a/.azuredevops/modulePipelines/ms.network.natgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.natgateways.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
index 9d0881dbc7..bde11f20c1 100644
--- a/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
+++ b/.azuredevops/modulePipelines/ms.network.networksecuritygroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
index 3b525b581f..2f431269f7 100644
--- a/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
+++ b/.azuredevops/modulePipelines/ms.network.networkwatchers.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Required as a dependency + Only one Network Watcher can exist in the same location. If removed, a default would be created in a dedicated RG
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.privatednszones.yml b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
index 0bb013e5f8..dd9af74bcd 100644
--- a/.azuredevops/modulePipelines/ms.network.privatednszones.yml
+++ b/.azuredevops/modulePipelines/ms.network.privatednszones.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
index b9e86be65f..23cee1dc8b 100644
--- a/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
+++ b/.azuredevops/modulePipelines/ms.network.privateendpoints.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
index badcb417ac..b72a6f5e5b 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipaddresses.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
index ee3ae3d98a..25bebc0cfe 100644
--- a/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
+++ b/.azuredevops/modulePipelines/ms.network.publicipprefixes.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.routetables.yml b/.azuredevops/modulePipelines/ms.network.routetables.yml
index 8dfd82292c..d71f6fea12 100644
--- a/.azuredevops/modulePipelines/ms.network.routetables.yml
+++ b/.azuredevops/modulePipelines/ms.network.routetables.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
index 80e7d38df7..5f8b91acaf 100644
--- a/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
+++ b/.azuredevops/modulePipelines/ms.network.trafficmanagerprofiles.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
index 859dbced39..9e648caf98 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworkgateways.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
index 8e4af17fc0..2c22bc3ff2 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualnetworks.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.network.virtualwans.yml b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
index fab75d09d2..be7e5ac34d 100644
--- a/.azuredevops/modulePipelines/ms.network.virtualwans.yml
+++ b/.azuredevops/modulePipelines/ms.network.virtualwans.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
index b941e93f5f..701b72a1e8 100644
--- a/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
+++ b/.azuredevops/modulePipelines/ms.operationalinsights.workspaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
index ef1ebcabf2..fe6fc9c5ad 100644
--- a/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
+++ b/.azuredevops/modulePipelines/ms.recoveryservices.vaults.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
index 8d4733592b..5186ec1510 100644
--- a/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
+++ b/.azuredevops/modulePipelines/ms.resources.deploymentscripts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
index 4f98a5ec58..f47032b6db 100644
--- a/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
+++ b/.azuredevops/modulePipelines/ms.resources.resourcegroups.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
index 302b62963f..c3656864fb 100644
--- a/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
+++ b/.azuredevops/modulePipelines/ms.security.azuresecuritycenter.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: false # Needs custom removals script
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
index 18a22a829e..4e12010811 100644
--- a/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
+++ b/.azuredevops/modulePipelines/ms.servicebus.namespaces.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
index 9ad4e5a8c0..1a4b50bc48 100644
--- a/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
+++ b/.azuredevops/modulePipelines/ms.sql.managedinstances.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.sql.servers.yml b/.azuredevops/modulePipelines/ms.sql.servers.yml
index 88855325bb..20fa3ddb66 100644
--- a/.azuredevops/modulePipelines/ms.sql.servers.yml
+++ b/.azuredevops/modulePipelines/ms.sql.servers.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
index 8869d678e8..3b7cb1e7cd 100644
--- a/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
+++ b/.azuredevops/modulePipelines/ms.storage.storageaccounts.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -56,9 +48,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
index 65fb083c1b..036e238e00 100644
--- a/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
+++ b/.azuredevops/modulePipelines/ms.synapse.privatelinkhubs.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
index 0ff785ac20..8d7a4abe90 100644
--- a/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
+++ b/.azuredevops/modulePipelines/ms.virtualmachineimages.imagetemplates.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.web.connections.yml b/.azuredevops/modulePipelines/ms.web.connections.yml
index d4b7ed0496..faf83ba5bd 100644
--- a/.azuredevops/modulePipelines/ms.web.connections.yml
+++ b/.azuredevops/modulePipelines/ms.web.connections.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
index 829da900c9..ae9a640c19 100644
--- a/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
+++ b/.azuredevops/modulePipelines/ms.web.hostingenvironments.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.web.serverfarms.yml b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
index 19fa310daf..fb4d7c2da0 100644
--- a/.azuredevops/modulePipelines/ms.web.serverfarms.yml
+++ b/.azuredevops/modulePipelines/ms.web.serverfarms.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -54,9 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/modulePipelines/ms.web.sites.yml b/.azuredevops/modulePipelines/ms.web.sites.yml
index d4944df4a1..02a3138d31 100644
--- a/.azuredevops/modulePipelines/ms.web.sites.yml
+++ b/.azuredevops/modulePipelines/ms.web.sites.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -57,9 +49,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'
diff --git a/.azuredevops/pipelineTemplates/module.jobs.publish.yml b/.azuredevops/pipelineTemplates/module.jobs.publish.yml
index 96d549e2b7..ef689bb78f 100644
--- a/.azuredevops/pipelineTemplates/module.jobs.publish.yml
+++ b/.azuredevops/pipelineTemplates/module.jobs.publish.yml
@@ -26,8 +26,6 @@
 ##   | poolName                        | '$(poolName)'                        | You can provide either a [poolname] or [vmImage] to run the job on                                      | 'Custom Deployment Pool'          |
 ##   | vmImage                         | '$(vmImage)'                         | You can provide either a [poolname] or [vmImage] to run the job on                                      | 'ubuntu20.04'                     |
 ##   | defaultJobTimeoutInMinutes      | 120                                  | The timeout for the job in this pipeline                                                                | 120                               |
-##   | versionOption                   | '$(versionOption)'                   | The mode to handle the version increments [major|minor|patch|custom].                                   | 'patch'                           |
-##   | moduleVersion                   | '$(moduleVersion)'                   | The version to enforce if [versionOption] is set to [custom]                                            | '1.0.0'                           |
 ##   | modulePath                      | '$(modulePath)'                      | The path to the module to deploy. E.g. [c:/KeyVault]                                                    | 'c:/KeyVault'                     |
 ##   | templateSpecsRGName             | '$(templateSpecsRGName)'             | Required to publish to template spec. ResourceGroup of the template spec to publish to                  | 'mgmt-rg'                         |
 ##   | templateSpecsRGLocation         | '$(templateSpecsRGLocation)'         | Required to publish to template spec. Location of the template spec resource group                      | 'West Europe'                     |
@@ -56,8 +54,6 @@ parameters:
 
   # Logic-related parameters
   ## Module-related
-  versionOption: '$(versionOption)'
-  moduleVersion: '$(moduleVersion)'
   modulePath: '$(modulePath)'
 
   ## TemplateSpec-related
@@ -211,21 +207,34 @@ jobs:
           ScriptType: InlineScript
           inline: |
             # Load used functions
+            . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
             . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
 
             $functionInput = @{
-              templateFilePath         = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
-              templateSpecsRgName      = '${{ parameters.templateSpecsRgName }}'
-              templateSpecsRgLocation  = '${{ parameters.templateSpecsRgLocation }}'
-              templateSpecsDescription = '${{ parameters.templateSpecsDescription }}'
-              customVersion            = '${{ parameters.customVersion }}'
-              versioningOption         = '${{ parameters.versioningOption }}'
+              TemplateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
             }
 
             Write-Verbose "Invoke task with" -Verbose
             Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-            Publish-ModuleToTemplateSpec @functionInput -Verbose
+            # Get the modified child resources
+            $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
+
+            # Publish the modified child resources
+            foreach ($ModuleToUpdate in $ModulesToUpdate) {
+              $functionInput = @{
+                TemplateFilePath         = $ModuleToUpdate.TemplateFilePath
+                TemplateSpecsRgName      = '${{ parameters.templateSpecsRgName }}'
+                TemplateSpecsRgLocation  = '${{ parameters.templateSpecsRgLocation }}'
+                TemplateSpecsDescription = '${{ parameters.templateSpecsDescription }}'
+                ModuleVersion            = $ModuleToUpdate.Version
+              }
+
+              Write-Verbose "Invoke task with" -Verbose
+              Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+
+              Publish-ModuleToTemplateSpec @functionInput -Verbose
+            }
 
       # [private bicep registry publish] task(s)
       #-------------------------------------------
@@ -244,18 +253,31 @@ jobs:
           ScriptType: InlineScript
           inline: |
             # Load used functions
+            . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
             . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
 
             $functionInput = @{
-              templateFilePath        = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
-              bicepRegistryName       = '${{ parameters.bicepRegistryName }}'
-              bicepRegistryRgName     = '${{ parameters.bicepRegistryRgName }}'
-              bicepRegistryRgLocation = '${{ parameters.bicepRegistryRgLocation }}'
-              customVersion           = '${{ parameters.customVersion }}'
-              versioningOption        = '${{ parameters.versioningOption }}'
+              TemplateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
             }
 
             Write-Verbose "Invoke task with" -Verbose
             Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
-            Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
+            # Get the modified child resources
+            $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
+
+            # Publish the modified child resources
+            foreach ($ModuleToUpdate in $ModulesToUpdate) {
+              $functionInput = @{
+                BicepRegistryName       = '${{ parameters.bicepRegistryName }}'
+                BicepRegistryRgName     = '${{ parameters.bicepRegistryRgName }}'
+                BicepRegistryRgLocation = '${{ parameters.bicepRegistryRgLocation }}'
+                ModuleVersion            = $ModuleToUpdate.Version
+              }
+
+              Write-Verbose "Invoke task with" -Verbose
+              Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+
+              Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
+            }
+

From adfec6f577c6236e91f4afabcec083e8c6145cc1 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 15:41:11 +0100
Subject: [PATCH 047/121] Added firewall policies workflow

---
 .../ms.network.firewallpolicies.yml           | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .azuredevops/modulePipelines/ms.network.firewallpolicies.yml

diff --git a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
new file mode 100644
index 0000000000..6eb99b2212
--- /dev/null
+++ b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
@@ -0,0 +1,51 @@
+name: 'Network - Firewallpolicies'
+
+parameters:
+  - name: removeDeployment
+    displayName: Remove deployed module
+    type: boolean
+    default: true
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
+
+trigger:
+  batch: true
+  branches:
+    include:
+      - main
+  paths:
+    include:
+      - '/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml'
+      - '/.azuredevops/pipelineTemplates/module.*.yml'
+      - '/arm/Microsoft.Network/firewallpolicies/*'
+    exclude:
+      - '/**/*.md'
+
+variables:
+  - template: '/.azuredevops/pipelineVariables/global.variables.yml'
+  - group: 'PLATFORM_VARIABLES'
+  - name: modulePath
+    value: '/arm/Microsoft.Network/firewallpolicies'
+
+stages:
+  - stage: Validation
+    displayName: Pester tests
+    jobs:
+      - template: /.azuredevops/pipelineTemplates/module.jobs.validate.yml
+
+  - stage: Deployment
+    displayName: Deployment tests
+    jobs:
+      - template: /.azuredevops/pipelineTemplates/module.jobs.deploy.yml
+        parameters:
+          removeDeployment: '${{ parameters.removeDeployment }}'
+          deploymentBlocks:
+            - path: $(modulePath)/.parameters/parameters.json
+
+  - stage: Publishing
+    displayName: Publish module
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
+    jobs:
+      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'

From 1b2f936bd4e1747b7475ccbddb4e6422cf86b19b Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 16:09:33 +0100
Subject: [PATCH 048/121] Added two TODO's as placeholders

---
 .azuredevops/pipelineTemplates/module.jobs.publish.yml | 1 +
 docs/wiki/PipelinesDesign.md                           | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.azuredevops/pipelineTemplates/module.jobs.publish.yml b/.azuredevops/pipelineTemplates/module.jobs.publish.yml
index ef689bb78f..ae09a28507 100644
--- a/.azuredevops/pipelineTemplates/module.jobs.publish.yml
+++ b/.azuredevops/pipelineTemplates/module.jobs.publish.yml
@@ -138,6 +138,7 @@ jobs:
 
       # [Universal Artifact-feed publish] task(s)
       #------------------------------------------
+      #  TODO: Add support for powershell driven array (New module versioning approach)
       - powershell: |
           # Load used functions
           . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Initialize-UniversalArtifactPublish.ps1')
diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index fa27e7deb7..6932a9dd36 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -99,6 +99,8 @@ For additional details on how removal works please refer to the dedicated [Remov
 
 ### Publish
 
+<!-- TODO: Update with updated publish logic -->
+
 The publish phase concludes each module's pipeline. If all previous tests succeeded (i.e. no phase failed) and the pipeline was executed in the [main\|master] branch, a new module version is published to all configured target locations. Currently we support
 - _template specs_
 - _private bicep registry_

From 9a5d43540a4eb85830ea3429fef6b86273314c0f Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 23 Jan 2022 19:14:59 +0100
Subject: [PATCH 049/121] Whitepace

---
 .../resourcePublish/Initialize-UniversalArtifactPublish.ps1      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1 b/utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1
index 3975d90a98..a1175e1775 100644
--- a/utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1
+++ b/utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1
@@ -145,6 +145,5 @@ function Initialize-UniversalArtifactPublish {
 
     end {
         Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-
     }
 }

From a7e4edc16e6cb6f89179e50cafd21d9418aa780a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Mon, 24 Jan 2022 21:41:22 +0800
Subject: [PATCH 050/121] change test

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index a49d21a2f0..c35bd16513 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -40,8 +40,8 @@ param diagnosticEventHubAuthorizationRuleId string = ''
 param diagnosticEventHubName string = ''
 
 @allowed([
-  'CanNotDelete'
   'NotSpecified'
+  'CanNotDelete'
   'ReadOnly'
 ])
 @description('Optional. Specify the type of lock.')

From c9a640ea9fa937c2c6d01e0ab30dfaf961d67c95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Mon, 24 Jan 2022 21:43:49 +0800
Subject: [PATCH 051/121] change test

---
 arm/Microsoft.Network/virtualNetworks/deploy.bicep | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm/Microsoft.Network/virtualNetworks/deploy.bicep b/arm/Microsoft.Network/virtualNetworks/deploy.bicep
index a8393f5d85..40e915c744 100644
--- a/arm/Microsoft.Network/virtualNetworks/deploy.bicep
+++ b/arm/Microsoft.Network/virtualNetworks/deploy.bicep
@@ -38,8 +38,8 @@ param diagnosticEventHubAuthorizationRuleId string = ''
 param diagnosticEventHubName string = ''
 
 @allowed([
-  'CanNotDelete'
   'NotSpecified'
+  'CanNotDelete'
   'ReadOnly'
 ])
 @description('Optional. Specify the type of lock.')

From ffb990ce16b2b2b8c76c5be9420db260cdbe2537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Gr=C3=A4f?= <segraef@microsoft.com>
Date: Wed, 26 Jan 2022 17:29:51 +0800
Subject: [PATCH 052/121] added doco

---
 docs/wiki/PipelinesDesign.md | 234 +++++++++++++++++++----------------
 1 file changed, 130 insertions(+), 104 deletions(-)

diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index 6932a9dd36..e547640d08 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -6,10 +6,14 @@ This section gives you an overview of the design principals the pipelines follow
 
 ### _Navigation_
 
+- [Pipelines Design](#pipelines-design)
+    - [_Navigation_](#navigation)
 - [Module Pipelines](#module-pipelines)
   - [Module pipeline inputs](#module-pipeline-inputs)
   - [Pipeline phases](#pipeline-phases)
     - [Validate](#validate)
+      - [Static module validation](#static-module-validation)
+      - [Simulated deployment validation](#simulated-deployment-validation)
     - [Test deploy](#test-deploy)
       - [Removal](#removal)
     - [Publish](#publish)
@@ -17,23 +21,29 @@ This section gives you an overview of the design principals the pipelines follow
     - [Prerequisites](#prerequisites)
     - [Pipeline secrets](#pipeline-secrets)
     - [Pipeline variables](#pipeline-variables)
+      - [**_General_**](#general)
+      - [**_Template-specs specific (publishing)_**](#template-specs-specific-publishing)
+      - [**_Private bicep registry specific (publishing)_**](#private-bicep-registry-specific-publishing)
     - [Tokens Replacement](#tokens-replacement)
 - [Platform pipelines](#platform-pipelines)
   - [Dependencies pipeline](#dependencies-pipeline)
+    - [Dependencies pipeline inputs](#dependencies-pipeline-inputs)
   - [ReadMe pipeline](#readme-pipeline)
   - [Wiki pipeline](#wiki-pipeline)
 - [DevOps-Tool-specific considerations](#devops-tool-specific-considerations)
   - [GitHub Workflows](#github-workflows)
-    - [Component: GitHub secret](#github-component-github-secrets)
-    - [Component: Variable file](#github-component-variable-file)
-    - [Component: Composite actions](#github-component-composite-actions)
-    - [Component: Workflows](#github-component-workflows)
+    - [**GitHub Component:** GitHub secrets](#github-component-github-secrets)
+    - [**GitHub Component:** Variable file](#github-component-variable-file)
+    - [**GitHub Component:** Composite Actions\*\*](#github-component-composite-actions)
+    - [**GitHub Component:** Workflows](#github-component-workflows)
   - [Azure DevOps Pipelines](#azure-devops-pipelines)
-    - [Component: Service connection](#azure-devops-component-service-connection)
-    - [Component: Variable group](#azure-devops-component-variable-group)
-    - [Component: Variable file](#azure-devops-component-variable-file)
-    - [Component: Pipeline templates](#azure-devops-component-pipeline-templates)
-    - [Component: Pipelines](#azure-devops-component-pipelines)
+    - [**Azure DevOps Component:** Service Connection](#azure-devops-component-service-connection)
+    - [**Azure DevOps Component:** Variable group](#azure-devops-component-variable-group)
+    - [**Azure DevOps Component:** Variable file](#azure-devops-component-variable-file)
+    - [**Azure DevOps Component:** Pipeline templates](#azure-devops-component-pipeline-templates)
+    - [**Azure DevOps Component:** Pipelines](#azure-devops-component-pipelines)
+      - [Azure DevOps Artifacts](#azure-devops-artifacts)
+
 ---
 
 # Module Pipelines
@@ -47,6 +57,7 @@ This section will give you an overview of the different phases and shared logic
 ## Module pipeline inputs
 
 Note that the pipeline comes with 4 runtime parameters you can provide when you trigger it:
+
 - `'Branch' dropdown`: A dropdown to select the branch to run the pipeline from
 - `'Remove module' switch`: Can be set to 'true' or 'false' and controls whether the test-deployed resources are removed after testing
 - `Versioning mode`: This option allows you to control the publishing behavior. Depending on the mode you select, a different part of the version is incremented (for example [major|minor|patch]), if no custom version is provided. For further information of how the input is processed see [publishing](#publish).
@@ -99,25 +110,27 @@ For additional details on how removal works please refer to the dedicated [Remov
 
 ### Publish
 
-<!-- TODO: Update with updated publish logic -->
+The publish phase concludes each module's pipeline. If all previous tests succeeded (i.e. no phase failed) and the pipeline was executed in the `main` or `master` branch, a new module version is published to all configured target locations. Currently we support the following target locations:
 
-The publish phase concludes each module's pipeline. If all previous tests succeeded (i.e. no phase failed) and the pipeline was executed in the [main\|master] branch, a new module version is published to all configured target locations. Currently we support
 - _template specs_
 - _private bicep registry_
 - _universal artifacts_ (_Azure DevOps_ only)
 
-By the time of this writing, the publishing experience works as follows:
-1. A user can optionally specify a version in the module's pipeline file, or during runtime. If the user does not, a default version is used
-1. No matter what publishing location we enabled, the corresponding logic will
-   1. Fetch the latest version of this module in the target location (if available)
-   1. Compare it with any specified custom version the user optionally provided
-      - If the custom version is higher, it is used going forward
-      - If it is lower, the fallback mechanism will select a new version based on some default behavior (e.g. increment to the next patch version)
-   1. The identified new version is then used to publish the module to the target location in question
+Besides the execution of a publish, there is also the possibility to set the switch `Publish prerelease module`. This switch makes it possible to publish a pre-release version in every workflow run that is not based on main or master.
+
+> **Note**<br>
+> The `version` used for publishing any artifact will be the same in all three target locations which reduces the maintenance effort.
+
+The publishing works as follows:
+
+1. The script `utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1` gets all changed module files including child modules and handles the logic of propagating the appropriate module version to be used:
+   1. The major (`x.0`) and minor (`0.x`) version are set based on the file `version.json` in the module folder.
+   1. The patch (`0.0.x`) version is calculated based on the number of commits on the `HEAD` ref. This Will cause the patch version to never reset to 0 with major and/or minor increment, as specified for [semver](https://semver.org/).
 
 ## Shared concepts
 
 There are several concepts that are shared among the phases. Most notably
+
 - [Prerequisites](#prerequisites)
 - [Pipeline secrets](#pipeline-serets)
 - [Pipeline variables](#pipeline-variables)
@@ -126,6 +139,7 @@ There are several concepts that are shared among the phases. Most notably
 ### Prerequisites
 
 For both the [simulated deployment validation](#simulated-deployment-validation) as well as the [test deployment](#test-deployment) we should account for the following prerequisites:
+
 - A _"Sandbox"_ or _"Engineering"_ **validation subscription** (in Azure) has to be used to test if the modules (or other components) are deployable. This subscription must not have connectivity to any on-premises or other Azure networks.
 - An Azure Active Directory [service principal](https://docs.microsoft.com/en-us/azure/active-directory/develop/app-objects-and-service-principals#service-principal-object) (AAD SPN) to authenticate to the validation subscription and run the test deployments of the modules.
 
@@ -133,12 +147,12 @@ For both the [simulated deployment validation](#simulated-deployment-validation)
 
 To use the platform pipelines you need several secrets set up in your DevOps platform. Contrary to the pipeline variables we describe in the [subsequent section](#pipeline-variables) these following variables are considered sensitive.
 
-| Secret Name | Example | Description |
-| - | - | - |
-| `ARM_MGMTGROUP_ID` | `de33a0e7-64d9-4a94-8fe9-b018cedf1e05` | The group ID of the management group to test deploy modules of that level in. |
-| `ARM_SUBSCRIPTION_ID` | `d0312b25-9160-4550-914f-8738d9b5caf5` | The subscription ID of the subscription to test deploy modules of that level in. |
-| `ARM_TENANT_ID` | `9734cec9-4384-445b-bbb6-767e7be6e5ec` | The tenant ID of the tenant to test deploy modules of that level in. |
-| `DEPLOYMENT_SP_ID` | `de33a0e7-64d9-4a94-8fe9-b018cedf1e05` | This is the Principal (Object ID) for the Service Principal used as the Azure service connection. It is used for Default Role Assignments when Modules are being deployed into Azure |
+| Secret Name           | Example                                | Description                                                                                                                                                                          |
+| --------------------- | -------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `ARM_MGMTGROUP_ID`    | `de33a0e7-64d9-4a94-8fe9-b018cedf1e05` | The group ID of the management group to test deploy modules of that level in.                                                                                                        |
+| `ARM_SUBSCRIPTION_ID` | `d0312b25-9160-4550-914f-8738d9b5caf5` | The subscription ID of the subscription to test deploy modules of that level in.                                                                                                     |
+| `ARM_TENANT_ID`       | `9734cec9-4384-445b-bbb6-767e7be6e5ec` | The tenant ID of the tenant to test deploy modules of that level in.                                                                                                                 |
+| `DEPLOYMENT_SP_ID`    | `de33a0e7-64d9-4a94-8fe9-b018cedf1e05` | This is the Principal (Object ID) for the Service Principal used as the Azure service connection. It is used for Default Role Assignments when Modules are being deployed into Azure |
 
 The location where to set these secrets up depends on the DevOps platform you use. Also, there may be additional platform-specific secrets to set up. For further information please refer to [this section](#devops-tool-specific-considerations).
 
@@ -146,27 +160,30 @@ The location where to set these secrets up depends on the DevOps platform you us
 
 The primary pipeline variable file hosts the fundamental pipeline configuration and is stored in a different location, based on the [DevOps platform](#devops-tool-specific-considerations). In here you will find and can configure information such as:
 
-#### ***General***
-| Variable Name | Example Value | Description |
-| - | - | - |
-| `defaultLocation` | "WestEurope" | The default location to deploy resources to. If no location is specified in the deploying parameter file, this location is used |
-| `resourceGroupName` | "validation-rg" | The resource group to deploy all resources for validation to |
-
-#### ***Template-specs specific (publishing)***
-| Variable Name | Example Value | Description |
-| - | - | - |
-| `templateSpecsRGName` | "artifacts-rg" | The resource group to host the created template-specs |
-| `templateSpecsRGLocation` | "WestEurope" | The location of the resource group to host the template-specs. Is used to create a new resource group if not yet existing |
-| `templateSpecsDescription` | "This is a module from the [Common Azure Resource Modules Library]" | A description to add to the published template specs |
-| `templateSpecsDoPublish` | "true" | A central switch to enable/disable publishing to template-specs |
-
-#### ***Private bicep registry specific (publishing)***
-| Variable Name | Example Value | Description |
-| - | - | - |
-| `bicepRegistryName` | "adpsxxazacrx001" | The container registry to publish bicep templates to |
-| `bicepRegistryRGName` | "artifacts-rg" | The resource group of the container registry to publish bicep templates to. Is used to create a new container registry if not yet existing |
-| `bicepRegistryRGName` | "artifacts-rg" | The location of the resource group of the container registry to publish bicep templates to. Is used to create a new resource group if not yet existing |
-| `bicepRegistryDoPublish` | "true" | A central switch to enable/disable publishing to the private bicep registry |
+#### **_General_**
+
+| Variable Name       | Example Value   | Description                                                                                                                     |
+| ------------------- | --------------- | ------------------------------------------------------------------------------------------------------------------------------- |
+| `defaultLocation`   | "WestEurope"    | The default location to deploy resources to. If no location is specified in the deploying parameter file, this location is used |
+| `resourceGroupName` | "validation-rg" | The resource group to deploy all resources for validation to                                                                    |
+
+#### **_Template-specs specific (publishing)_**
+
+| Variable Name              | Example Value                                                       | Description                                                                                                               |
+| -------------------------- | ------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
+| `templateSpecsRGName`      | "artifacts-rg"                                                      | The resource group to host the created template-specs                                                                     |
+| `templateSpecsRGLocation`  | "WestEurope"                                                        | The location of the resource group to host the template-specs. Is used to create a new resource group if not yet existing |
+| `templateSpecsDescription` | "This is a module from the [Common Azure Resource Modules Library]" | A description to add to the published template specs                                                                      |
+| `templateSpecsDoPublish`   | "true"                                                              | A central switch to enable/disable publishing to template-specs                                                           |
+
+#### **_Private bicep registry specific (publishing)_**
+
+| Variable Name            | Example Value     | Description                                                                                                                                            |
+| ------------------------ | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `bicepRegistryName`      | "adpsxxazacrx001" | The container registry to publish bicep templates to                                                                                                   |
+| `bicepRegistryRGName`    | "artifacts-rg"    | The resource group of the container registry to publish bicep templates to. Is used to create a new container registry if not yet existing             |
+| `bicepRegistryRGName`    | "artifacts-rg"    | The location of the resource group of the container registry to publish bicep templates to. Is used to create a new resource group if not yet existing |
+| `bicepRegistryDoPublish` | "true"            | A central switch to enable/disable publishing to the private bicep registry                                                                            |
 
 ### Tokens Replacement
 
@@ -195,6 +212,7 @@ As the modules we test often times have dependencies to other services, we creat
 ### Dependencies pipeline inputs
 
 Note that the pipeline comes with 2 runtime parameters you can provide when you trigger it:
+
 - `'Branch' dropdown`: A dropdown to select the branch to run the pipeline from
 - `'Enable SQL MI dependency deployment' switch`: Can be set to 'true' or 'false' and controls whether the dependencies for the SQL-MI are deployed during execution or not
 
@@ -222,6 +240,7 @@ Depending on what DevOps tool you want to use to host the platform you will find
 ## GitHub Workflows
 
 [GitHub actions & workflows](https://docs.github.com/en/actions) are the CI/CD solution provided by GitHub. To get the platform going, we use the following elements:
+
 - **[GitHub secrets:](#github-component-github-secrets)** We leverage GitHub repository secrets to store central and potentially sensitive information we need to perform deployments and other platform specific actions
 - **[Variable file:](#github-component-variable-file)** This file contains the configuration for all module pipelines in this repository.
 - **[Composite actions:](#github-component-composite-actions)** Composite actions bundle a set of actions for a specific purpose together. They are referenced by module pipelines.
@@ -235,25 +254,25 @@ The GitHub repository secrets can be set up in the repositories _'Settings'_ as
 
 For _GitHub_ in particular we need the following secrets in addition to those described in the shared [pipeline secrets](#pipeline-secrets) section:
 
-| Secret Name | Example | Description |
-| - | - | - |
-| `AZURE_CREDENTIALS` |  `{"clientId": "4ce8ce4c-cac0-48eb-b815-65e5763e2929", "clientSecret": "<placeholder>", "subscriptionId": "d0312b25-9160-4550-914f-8738d9b5caf5", "tenantId": "9734cec9-4384-445b-bbb6-767e7be6e5ec" }` | The login credentials of the [deployment principal](./GettingStarted#platform-principal) to use to log into the target Azure environment to test in. The format is described [here](https://github.com/Azure/login#configure-deployment-credentials). |
-| `PLATFORM_REPO_UPDATE_PAT` | `<placeholder>` | A PAT with enough permissions assigned to it to push into the main branch. This PAT is leveraged by pipelines that automatically generate ReadMe files to keep them up to date |
+| Secret Name                | Example                                                                                                                                                                                                | Description                                                                                                                                                                                                                                           |
+| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `AZURE_CREDENTIALS`        | `{"clientId": "4ce8ce4c-cac0-48eb-b815-65e5763e2929", "clientSecret": "<placeholder>", "subscriptionId": "d0312b25-9160-4550-914f-8738d9b5caf5", "tenantId": "9734cec9-4384-445b-bbb6-767e7be6e5ec" }` | The login credentials of the [deployment principal](./GettingStarted#platform-principal) to use to log into the target Azure environment to test in. The format is described [here](https://github.com/Azure/login#configure-deployment-credentials). |
+| `PLATFORM_REPO_UPDATE_PAT` | `<placeholder>`                                                                                                                                                                                        | A PAT with enough permissions assigned to it to push into the main branch. This PAT is leveraged by pipelines that automatically generate ReadMe files to keep them up to date                                                                        |
 
 ### **GitHub Component:** Variable file
 
 The [pipeline configuration file](#pipeline-variables) can be found at `.github/variables/global.variables.json`.
 
-### **GitHub Component:** Composite Actions**
+### **GitHub Component:** Composite Actions\*\*
 
 We use several composite actions to perform various tasks shared by our module workflows:
 
-| Composite Action | Description |
-| - | - |
-| **validateModulePester** | This action performs [static tests](#static-module-validation) for a module using Pester, including API versions focused tests to avoid those become stale overtime. |
-| **validateModuleDeployment:** | This action performs the following tasks: <li> A [simulated deployment](#simulated-deployment-validation) using a provided parameter file. <li>An [actual deployment](#test-deploy) to Azure using a provided parameter file. <li>The [removal](#removal) of the test-deployed resources |
-| **publishModule:** | This action is capable of [publishing](#publish) the given template to a location specified in the pipeline [variable file](#github-component-variable-file). |
-| **getWorkflowInput:** | This action allows us to fetch workflow input values from the module's workflow file, even if the pipeline was not triggered via a `workflow_dispatch` action. Without it we would not be able to process the contained information and would need to duplicate the configuration as workflow variables. Such input values are for example the removal switch `removeDeployment`. |
+| Composite Action              | Description                                                                                                                                                                                                                                                                                                                                                                       |
+| ----------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **validateModulePester**      | This action performs [static tests](#static-module-validation) for a module using Pester, including API versions focused tests to avoid those become stale overtime.                                                                                                                                                                                                              |
+| **validateModuleDeployment:** | This action performs the following tasks: <li> A [simulated deployment](#simulated-deployment-validation) using a provided parameter file. <li>An [actual deployment](#test-deploy) to Azure using a provided parameter file. <li>The [removal](#removal) of the test-deployed resources                                                                                          |
+| **publishModule:**            | This action is capable of [publishing](#publish) the given template to a location specified in the pipeline [variable file](#github-component-variable-file).                                                                                                                                                                                                                     |
+| **getWorkflowInput:**         | This action allows us to fetch workflow input values from the module's workflow file, even if the pipeline was not triggered via a `workflow_dispatch` action. Without it we would not be able to process the contained information and would need to duplicate the configuration as workflow variables. Such input values are for example the removal switch `removeDeployment`. |
 
 ### **GitHub Component:** Workflows
 
@@ -261,7 +280,7 @@ These are the individual end-to-end workflows we have for each module. Leveragin
 
 Comparing multiple workflows you'll notice they are almost identical, yet differ in a few important areas:
 
-- The ***[path filters](https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions)*** of the workflow trigger:
+- The **_[path filters](https://docs.github.com/en/actions/learn-github-actions/workflow-syntax-for-github-actions)_** of the workflow trigger:
   | Purpose | Example |
   | - | - |
   | Include the composite actions | `- '.github/actions/templates/**'` |
@@ -270,17 +289,19 @@ Comparing multiple workflows you'll notice they are almost identical, yet differ
   | Exclude any ReadMe | `- '!*/**/readme.md'` |
 
   Full example
+
   ```yaml
-    push:
-      branches:
-        - main
-      paths:
-        - '.github/actions/templates/**'
-        - '.github/workflows/ms.network.virtualwans.yml'
-        - 'arm/Microsoft.Network/virtualWans/**'
-        - '!arm/Microsoft.Network/virtualWans/readme.md'
+  push:
+    branches:
+      - main
+    paths:
+      - ".github/actions/templates/**"
+      - ".github/workflows/ms.network.virtualwans.yml"
+      - "arm/Microsoft.Network/virtualWans/**"
+      - "!arm/Microsoft.Network/virtualWans/readme.md"
   ```
-- The ***environment variables***
+
+- The **_environment variables_**
   The environment variables are leveraged by the workflow to fundamentally process the module. We need:
   | Variable | Description | Example |
   | - | - | - |
@@ -288,10 +309,11 @@ Comparing multiple workflows you'll notice they are almost identical, yet differ
   | `workflowPath` | Relative path to the workflow itself | `workflowPath: '.github/workflows/ms.network.virtualwans.yml'` |
 
   Full example
+
   ```yaml
   env:
-    modulePath: 'arm/Microsoft.Network/virtualWans'
-    workflowPath: '.github/workflows/ms.network.virtualwans.yml'
+    modulePath: "arm/Microsoft.Network/virtualWans"
+    workflowPath: ".github/workflows/ms.network.virtualwans.yml"
   ```
 
 ## Azure DevOps Pipelines
@@ -316,7 +338,7 @@ The variable group can be set up under _Pipelines: Library_ as described [here](
 
 ```yaml
 variables:
-  - group: 'PLATFORM_VARIABLES'
+  - group: "PLATFORM_VARIABLES"
 ```
 
 ### **Azure DevOps Component:** Variable file
@@ -325,15 +347,15 @@ The variable file is a source controlled configuration file to control the behav
 
 This file is divided into multiple categories of variables used in the pipelines:
 
-| Section | Description |
-| - | - |
-| **Agent settings** | Contains information of the agent and service connection to use |
-| **Source** | Contains information about the Azure DevOps instance itself, including some important folder paths |
-| **Validation deployment settings** | Contains the default deployment information to use in the pipeline. For example, the default location to deploy resources to |
-| **Publish: Template-Spec settings** | Contains the required information to publish to template-specs, including a switch to toggle the publishing to template specs on or off |
-| **Publish: Universal packages settings** | Contains the required information to publish to universal packages, including a switch to toggle the publishing to universal packages on or off |
+| Section                                      | Description                                                                                                                                                     |
+| -------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Agent settings**                           | Contains information of the agent and service connection to use                                                                                                 |
+| **Source**                                   | Contains information about the Azure DevOps instance itself, including some important folder paths                                                              |
+| **Validation deployment settings**           | Contains the default deployment information to use in the pipeline. For example, the default location to deploy resources to                                    |
+| **Publish: Template-Spec settings**          | Contains the required information to publish to template-specs, including a switch to toggle the publishing to template specs on or off                         |
+| **Publish: Universal packages settings**     | Contains the required information to publish to universal packages, including a switch to toggle the publishing to universal packages on or off                 |
 | **Publish: Private Bicep Registry settings** | Contains the required information to publish to the private bicep registry, including a switch to toggle the publishing to the private bicep registry on or off |
-| **Azure PowerShell Version** | Contains information about the default PowerShell version to use in the pipeline |
+| **Azure PowerShell Version**                 | Contains information about the default PowerShell version to use in the pipeline                                                                                |
 
 More information about the contained variables can be found in the linked file itself.
 
@@ -341,11 +363,11 @@ More information about the contained variables can be found in the linked file i
 
 To keep the amount of pipeline code at a minimum we make heavy use of pipeline templates. Following you can find an overview of the ones we use and what they are used for:
 
-| Template Name | Description |
-| - | - |
-| **module.jobs.validate.yml** | This template perform all [static tests](#static-module-validation) for a module using Pester. |
-| **module.jobs.deploy.yml** | This template performs a [test deployment](#simulated-deployment-validation) followed by an [actual deployment](#test-deploy) to Azure using a provided parameter file. Once a deployment completed it [removes](#removal) the resource |
-| **module.jobs.publish.yml** | This template is capable of [publishing](#publish) the given template to a location specified in the pipeline [variable file](#azure-devops-component-variable-file) |
+| Template Name                | Description                                                                                                                                                                                                                             |
+| ---------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **module.jobs.validate.yml** | This template perform all [static tests](#static-module-validation) for a module using Pester.                                                                                                                                          |
+| **module.jobs.deploy.yml**   | This template performs a [test deployment](#simulated-deployment-validation) followed by an [actual deployment](#test-deploy) to Azure using a provided parameter file. Once a deployment completed it [removes](#removal) the resource |
+| **module.jobs.publish.yml**  | This template is capable of [publishing](#publish) the given template to a location specified in the pipeline [variable file](#azure-devops-component-variable-file)                                                                    |
 
 Each file can be found in path `.azuredevops/pipelineTemplates`.
 
@@ -355,8 +377,8 @@ These are the individual end-to-end pipelines we have for each module. Leveragin
 
 While they look very similar they have specific areas in which they differ:
 
-- The ***path filters*** of the pipeline trigger:
-   Purpose | Example |
+- The **_path filters_** of the pipeline trigger:
+  Purpose | Example |
   | - | - |
   | Include the templates | `- '/.azuredevops/pipelineTemplates/module.*.yml'` |
   | Include the relative path to the pipeline itself | `- '/.azuredevops/modulePipelines/ms.analysisservices.servers.yml' ` |
@@ -364,22 +386,25 @@ While they look very similar they have specific areas in which they differ:
   | Exclude any readme | `- '/**/*.md'` |
 
   Full example:
+
   ```yaml
-    trigger:
-      batch: true
-      branches:
-        include:
-          - main
-      paths:
-        include:
-          - '/.azuredevops/modulePipelines/ms.analysisservices.servers.yml'
-          - '/.azuredevops/pipelineTemplates/module.*.yml'
-          - '/arm/Microsoft.AnalysisServices/servers/*'
-        exclude:
-          - '/**/*.md'
+  trigger:
+    batch: true
+    branches:
+      include:
+        - main
+    paths:
+      include:
+        - "/.azuredevops/modulePipelines/ms.analysisservices.servers.yml"
+        - "/.azuredevops/pipelineTemplates/module.*.yml"
+        - "/arm/Microsoft.AnalysisServices/servers/*"
+      exclude:
+        - "/**/*.md"
   ```
-  > ***Note:*** By the time of this writing, wildcards are temporarily not supported by Azure DevOps
-- The ***variables***
+
+  > **_Note:_** By the time of this writing, wildcards are temporarily not supported by Azure DevOps
+
+- The **_variables_**
   The variables are leveraged by the pipelines to fundamentally process the module. We need:
   | Variable | Description | Example |
   | - | - | - |
@@ -388,12 +413,13 @@ While they look very similar they have specific areas in which they differ:
   | `modulePath` | Relative path to the module folder | <code>- name: modulePath<p>&nbsp;&nbsp;value: '/arm/Microsoft.AnalysisServices/servers'</code> |
 
   Full example:
+
   ```yaml
-    variables:
-      - template: '/.azuredevops/pipelineVariables/global.variables.yml'
-      - group: 'PLATFORM_VARIABLES'
-      - name: modulePath
-        value: '/arm/Microsoft.AnalysisServices/servers'
+  variables:
+    - template: "/.azuredevops/pipelineVariables/global.variables.yml"
+    - group: "PLATFORM_VARIABLES"
+    - name: modulePath
+      value: "/arm/Microsoft.AnalysisServices/servers"
   ```
 
 #### Azure DevOps Artifacts

From d8b45ca3c9f9096d22bfaa278a3b2841b7c2339f Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 13:23:57 +0100
Subject: [PATCH 053/121] Added token and corrected feedproject param

---
 .../pipelineTemplates/module.jobs.publish.yml | 126 ++++++++++--------
 1 file changed, 70 insertions(+), 56 deletions(-)

diff --git a/.azuredevops/pipelineTemplates/module.jobs.publish.yml b/.azuredevops/pipelineTemplates/module.jobs.publish.yml
index ae09a28507..3a91088dc8 100644
--- a/.azuredevops/pipelineTemplates/module.jobs.publish.yml
+++ b/.azuredevops/pipelineTemplates/module.jobs.publish.yml
@@ -30,8 +30,9 @@
 ##   | templateSpecsRGName             | '$(templateSpecsRGName)'             | Required to publish to template spec. ResourceGroup of the template spec to publish to                  | 'mgmt-rg'                         |
 ##   | templateSpecsRGLocation         | '$(templateSpecsRGLocation)'         | Required to publish to template spec. Location of the template spec resource group                      | 'West Europe'                     |
 ##   | templateSpecsDescription        | '$(templateSpecsDescription)'        | Required to publish to template spec. Description of the template spec to publish to                    | 'IaCs module'                     |
+##   | vstsFeedToken                   | '$(vstsFeedToken)'                   | Required to publish to a DevOps feed. Token with access to the feed to publish to.                      | '...'                             |
 ##   | vstsFeedName                    | '$(vstsFeedName)'                    | Required to publish to a DevOps feed. Name to the feed to publish to.                                   | 'modules'                         |
-##   | vstsProject                     | '$(System.TeamProject)'              | Required to publish to a DevOps feed. Name of the project hosting the artifacts feed. May be empty.     | 'iacs'                            |
+##   | vstsFeedProject                 | '$(vstsFeedProject)'                 | Required to publish to a DevOps feed. Name of the project hosting the artifacts feed. May be empty.     | 'iacs'                            |
 ##   | bicepRegistryName               | '$(bicepRegistryName)'               | Required to publish to the private bicep registry. Name of the hosting container registry               | 'adpsxxazacrx001'                 |
 ##   | bicepRegistryRGName             | '$(bicepRegistryRGName)'             | Required to publish to the private bicep registry. Resource group of the hosting container registry     | 'artifacts-rg'                    |
 ##   | bicepRegistryRgLocation         | '$(bicepRegistryRgLocation)'         | Required to publish to the private bicep registry. Location of the RG of the hosting container registry | 'West Europe'                     |
@@ -57,16 +58,20 @@ parameters:
   modulePath: '$(modulePath)'
 
   ## TemplateSpec-related
+  templateSpecsDoPublish: '$(templateSpecsDoPublish)'
   templateSpecsRGName: '$(templateSpecsRGName)'
   templateSpecsRGLocation: '$(templateSpecsRGLocation)'
   templateSpecsDescription: '$(templateSpecsDescription)'
 
   ## Artifact-Feed-related
-  vstsFeedName: '$(vstsFeedName)'
-  vstsProject: '$(System.TeamProject)'
+  artifactsFeedDoPublish: '$(artifactsFeedDoPublish)'
   vstsOrganization: '$(vstsOrganization)'
+  vstsFeedProject: '$(vstsFeedProject)'
+  vstsFeedName: '$(vstsFeedName)'
+  vstsFeedToken: '$(vstsFeedToken)'
 
   ## Private-Bicep-Registry-related
+  bicepRegistryDoPublish: '$(bicepRegistryDoPublish)'
   bicepRegistryName: '$(bicepRegistryName)'
   bicepRegistryRGName: '$(bicepRegistryRGName)'
   bicepRegistryRgLocation: '$(bicepRegistryRgLocation)'
@@ -138,58 +143,55 @@ jobs:
 
       # [Universal Artifact-feed publish] task(s)
       #------------------------------------------
-      #  TODO: Add support for powershell driven array (New module versioning approach)
-      - powershell: |
-          # Load used functions
-          . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Initialize-UniversalArtifactPublish.ps1')
-
-          $functionInput = @{
-            templateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
-            vstsOrganization = '${{ parameters.vstsOrganization }}'
-            vstsProject      = '${{ parameters.vstsProject }}'
-            vstsFeedName     = '${{ parameters.vstsFeedName }}'
-            customVersion    = '${{ parameters.customVersion }}'
-            versioningOption = '${{ parameters.versioningOption }}'
-          }
-
-          Write-Verbose "Invoke task with" -Verbose
-          Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
-
-          $output = Initialize-UniversalArtifactPublish @functionInput -Verbose
-
-          # Write output value(s) into pipeline environment
-          $output.Keys | ForEach-Object {
-            Write-Host ("Publishing variable [{0}] with value [{1}] to pipeline environment" -f $_, $output[$_])
-            Write-Host ("##vso[task.setVariable variable={0}]{1}" -f $_, $output[$_])
-          }
-        displayName: 'Prepare publish to artifacts feed'
+      - task: PowerShell@2
+        displayName: 'Publish module to artifacts feed'
         condition: and(
           eq(variables['artifactsFeedDoPublish'], true),
           succeeded()
           )
         enabled: true
-        env:
-          TOKEN: $(system.accesstoken)
-
-      - task: UniversalPackages@0
-        condition: and(
-          eq(variables['artifactsFeedDoPublish'], true),
-          succeeded()
-          )
-        displayName: Publish Universal Package
         inputs:
-          command: publish
-          publishDirectory: '$(ENVMODULEPATH)'
-          ${{ if eq(parameters.vstsProject, '') }}:
-            vstsFeedPublish: '${{ parameters.vstsFeedName }}'
-          ${{ if ne(parameters.vstsProject, '') }}:
-            vstsFeedPublish: '${{ parameters.vstsProject }}/${{ parameters.vstsFeedName }}'
-          vstsFeedPackagePublish: '$(universalPackageModuleName)' # Published via [Initialize-UniversalArtifactPublish] invocation
-          versionOption: '$(publishingMode)' # Published via [Initialize-UniversalArtifactPublish] invocation
-          versionPublish: '$(newVersionObject)' # Published via [Initialize-UniversalArtifactPublish] invocation
-          packagePublishDescription: '$(universalPackageModuleName) Module'
-          verbosity: 'error'
-        enabled: true
+          targetType: inline
+          pwsh: true
+          script: |
+            # Load used functions
+            . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
+            . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Publish-ModuleToUniversalArtifactFeed.ps1')
+
+            #Prioritizing the bicep file
+            $TemplateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
+            if (-not (Test-Path $TemplateFilePath)) {
+              $TemplateFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.json'
+            }
+
+            $functionInput = @{
+              TemplateFilePath = $TemplateFilePath
+            }
+
+            Write-Verbose "Invoke Get-ModulesToUpdate with" -Verbose
+            Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+
+            # Get the modified child resources
+            $ModulesToUpdate = Get-ModulesToUpdate @functionInput -Verbose
+
+            # Publish the modified child resources
+            foreach ($ModuleToUpdate in $ModulesToUpdate) {
+              $functionInput = @{
+                TemplateFilePath = $ModuleToUpdate.TemplateFilePath
+                VstsOrganization = '${{ parameters.vstsOrganization }}'
+                VstsFeedProject  = '${{ parameters.vstsFeedProject }}'
+                VstsFeedName     = '${{ parameters.vstsFeedName }}'
+                ModuleVersion    = $ModuleToUpdate.Version
+                BearerToken      = $env:TOKEN
+              }
+
+              Write-Verbose "Invoke Publish-ModuleToUniversalArtifactFeed with" -Verbose
+              Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
+
+              Publish-ModuleToUniversalArtifactFeed @functionInput -Verbose
+            }
+        env:
+          TOKEN: $(vstsFeedToken)
 
       # [template-spec publish] task(s)
       #--------------------------------
@@ -211,11 +213,17 @@ jobs:
             . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
             . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Publish-ModuleToTemplateSpec.ps1')
 
+            #Prioritizing the bicep file
+            $TemplateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
+            if (-not (Test-Path $TemplateFilePath)) {
+              $TemplateFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.json'
+            }
+
             $functionInput = @{
-              TemplateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
+              TemplateFilePath = $TemplateFilePath
             }
 
-            Write-Verbose "Invoke task with" -Verbose
+            Write-Verbose "Invoke Get-ModulesToUpdate with" -Verbose
             Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
             # Get the modified child resources
@@ -231,7 +239,7 @@ jobs:
                 ModuleVersion            = $ModuleToUpdate.Version
               }
 
-              Write-Verbose "Invoke task with" -Verbose
+              Write-Verbose "Invoke Publish-ModuleToTemplateSpec with" -Verbose
               Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
               Publish-ModuleToTemplateSpec @functionInput -Verbose
@@ -257,11 +265,17 @@ jobs:
             . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Get-ModulesToUpdate.ps1')
             . (Join-Path '$(System.DefaultWorkingDirectory)' '$(pipelineFunctionsPath)' 'resourcePublish' 'Publish-ModuleToPrivateBicepRegistry.ps1')
 
+            #Prioritizing the bicep file
+            $TemplateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
+            if (-not (Test-Path $TemplateFilePath)) {
+              $TemplateFilePath = Join-Path -Path $FolderPath -ChildPath 'deploy.json'
+            }
+
             $functionInput = @{
-              TemplateFilePath = Join-Path '$(ENVMODULEPATH)' 'deploy.bicep'
+              TemplateFilePath = $TemplateFilePath
             }
 
-            Write-Verbose "Invoke task with" -Verbose
+            Write-Verbose "Invoke Get-ModulesToUpdate with" -Verbose
             Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
             # Get the modified child resources
@@ -270,15 +284,15 @@ jobs:
             # Publish the modified child resources
             foreach ($ModuleToUpdate in $ModulesToUpdate) {
               $functionInput = @{
+                TemplateFilePath         = $ModuleToUpdate.TemplateFilePath
                 BicepRegistryName       = '${{ parameters.bicepRegistryName }}'
                 BicepRegistryRgName     = '${{ parameters.bicepRegistryRgName }}'
                 BicepRegistryRgLocation = '${{ parameters.bicepRegistryRgLocation }}'
                 ModuleVersion            = $ModuleToUpdate.Version
               }
 
-              Write-Verbose "Invoke task with" -Verbose
+              Write-Verbose "Invoke Publish-ModuleToPrivateBicepRegistry with" -Verbose
               Write-Verbose ($functionInput | ConvertTo-Json | Out-String) -Verbose
 
               Publish-ModuleToPrivateBicepRegistry @functionInput -Verbose
             }
-

From dcb350cc0aa7efaa9afefb8efe8799769f211c0a Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 13:24:24 +0100
Subject: [PATCH 054/121] Added feedtoken as a var

---
 .azuredevops/pipelineVariables/global.variables.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.azuredevops/pipelineVariables/global.variables.yml b/.azuredevops/pipelineVariables/global.variables.yml
index 71f67a5d77..2a619c99af 100644
--- a/.azuredevops/pipelineVariables/global.variables.yml
+++ b/.azuredevops/pipelineVariables/global.variables.yml
@@ -40,6 +40,7 @@ variables:
   artifactsFeedDoPublish: true # Set to true, if you would like to publish modules as Universal Packages (in Azure DevOps Artifacts)
   vstsFeedName: 'ResourceModules' # The name of the Azure DevOps universal packages feed to publish to
   vstsFeedProject: '$(System.TeamProject)' # The project that hosts the feed
+  vstsFeedToken: $(System.AccessToken) # The token used to publish universal packages into the feed above
 
   ######################################
   # Publish: Private Bicep Registry settings

From 2bd96b46896a8d80219cf82cb92e6801a7673be5 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 13:25:03 +0100
Subject: [PATCH 055/121] added master on applicable default branches

---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 71a76cbc22..d4db798d06 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -22,7 +22,8 @@ la---          08.12.2021    15:50           7133 Script.ps1
 Get modified files between previous and current commit.
 #>
 function Get-ModifiedFiles {
-
+    # TODO: On custom branch this will only compare the last commit, maybe worth testing this with 'main' branch?
+    # https://devconnected.com/how-to-compare-two-git-branches/
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
@@ -65,7 +66,6 @@ la---          05.12.2021    22:45           1230 deploy.bicep
 Gets the closest deploy.bicep/json file to the current directory.
 #>
 function Find-TemplateFile {
-
     [CmdletBinding()]
     param (
         [Parameter(Mandatory)]
@@ -301,7 +301,7 @@ function Get-NewModuleVersion {
     $NewVersion = "$Version.$Patch"
 
     $CurrentBranch = git branch --show-current
-    if ($CurrentBranch -ne 'main') {
+    if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
         $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
         $NewVersion = "$NewVersion-Preview-$PreRelease"
     }

From 42dcaf382f229d19e022226891bb72f8be930f61 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 13:25:30 +0100
Subject: [PATCH 056/121] Documentation and parameter alignment

---
 .../Publish-ModuleToPrivateBicepRegistry.ps1  | 21 ++++++++++++-------
 .../Publish-ModuleToTemplateSpec.ps1          | 21 ++++++++++++-------
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index 30ee38a421..725dc094ae 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -7,21 +7,26 @@ Publish a new version of a given module to a private bicep registry
 
 .PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
+Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+
+.PARAMETER ModuleVersion
+Required. Version of the module to publish, following SemVer convention.
+Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
 
 .PARAMETER BicepRegistryName
 Mandatory. Name of the private bicep registry to publish to.
+Example: 'adpsxxazacrx001'
 
 .PARAMETER BicepRegistryRgName
 Mandatory. ResourceGroup of the private bicep registry to publish to.
+Example: 'artifacts-rg'
 
 .PARAMETER BicepRegistryRgLocation
 Optional. The location of the resourceGroup the private bicep registry is deployed to. Required if the resource group is not yet existing.
-
-.PARAMETER ModuleVersion
-Required. Version of the module to publish.
+Example: 'West Europe'
 
 .EXAMPLE
-Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:/KeyVault/deploy.json' -BicepRegistryRgName 'artifacts-rg' -ModuleVersion '3.0.0-alpha'
+Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
 
 Try to publish the KeyVault module with version 3.0.0-alpha to a private bicep registry called KeyVault based on a value provided in the UI
 #>
@@ -32,6 +37,9 @@ function Publish-ModuleToPrivateBicepRegistry {
         [Parameter(Mandatory)]
         [string] $TemplateFilePath,
 
+        [Parameter(Mandatory)]
+        [string] $ModuleVersion,
+
         [Parameter(Mandatory)]
         [string] $BicepRegistryName,
 
@@ -39,10 +47,7 @@ function Publish-ModuleToPrivateBicepRegistry {
         [string] $BicepRegistryRgName,
 
         [Parameter(Mandatory = $false)]
-        [string] $BicepRegistryRgLocation,
-
-        [Parameter(Mandatory)]
-        [string] $ModuleVersion
+        [string] $BicepRegistryRgLocation
     )
 
     begin {
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
index 990ba5a98c..9f50f58a34 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
@@ -8,21 +8,26 @@ The template spec is set up if not already existing.
 
 .PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
+Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+
+.PARAMETER ModuleVersion
+Required. Version of the module to publish, following SemVer convention.
+Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
 
 .PARAMETER TemplateSpecsRgName
 Mandatory. ResourceGroup of the template spec to publish to.
+Example: 'artifacts-rg'
 
 .PARAMETER TemplateSpecsRgLocation
 Mandatory. Location of the template spec resource group.
+Example: 'West Europe'
 
 .PARAMETER TemplateSpecsDescription
 Mandatory. The description of the parent template spec.
-
-.PARAMETER ModuleVersion
-Required. Version of the module to publish.
+Example: 'iacs key vault'
 
 .EXAMPLE
-Publish-ModuleToTemplateSpec -TemplateFilePath 'C:/KeyVault/deploy.json' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault' -ModuleVersion '3.0.0-alpha'
+Publish-ModuleToTemplateSpec -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault'
 
 Try to publish the KeyVault module with version 3.0.0 to a template spec called KeyVault based on a value provided in the UI
 #>
@@ -34,16 +39,16 @@ function Publish-ModuleToTemplateSpec {
         [string] $TemplateFilePath,
 
         [Parameter(Mandatory)]
-        [string] $TemplateSpecsRgName,
+        [string] $ModuleVersion,
 
         [Parameter(Mandatory)]
-        [string] $TemplateSpecsRgLocation,
+        [string] $TemplateSpecsRgName,
 
         [Parameter(Mandatory)]
-        [string] $TemplateSpecsDescription,
+        [string] $TemplateSpecsRgLocation,
 
         [Parameter(Mandatory)]
-        [string] $ModuleVersion
+        [string] $TemplateSpecsDescription
     )
 
     begin {

From 1c386ea32c9ce54fde9369b28b9551ebc502440c Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 13:25:58 +0100
Subject: [PATCH 057/121] New file for publish to artifact feed

---
 .../Publish-ModuleToUniversalArtifactFeed.ps1 | 117 ++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1

diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
new file mode 100644
index 0000000000..e4eb77b7c9
--- /dev/null
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -0,0 +1,117 @@
+<#
+.SYNOPSIS
+Publish a new version of a given module to a DevOps artifact feed
+
+.DESCRIPTION
+Publish a new version of a given module to a DevOps artifact feed
+
+.PARAMETER TemplateFilePath
+Mandatory. Path to the module deployment file from root.
+Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
+
+.PARAMETER ModuleVersion
+Required. Version of the module to publish, following SemVer convention.
+Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
+
+.PARAMETER VstsOrganization
+Mandatory. Azure DevOps organization URL hosting the artifacts feed.
+Example: 'https://dev.azure.com/fabrikam/'.
+
+.PARAMETER VstsFeedProject
+Optional. Name of the project hosting the artifacts feed. May be empty.
+Example: 'IaC'.
+
+.PARAMETER VstsFeedName
+Mandatory. Name to the feed to publish to.
+Example: 'Artifacts'.
+
+.PARAMETER BearerToken
+Optional. The bearer token to use to authenticate the request. If not provided it MUST be existing in your environment as `$env:TOKEN`
+
+.EXAMPLE
+Publish-ModuleToUniversalArtifactFeed -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -VstsOrganization 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
+
+Try to publish the KeyVault module with version 3.0.0-alpha to a Universal Package Feed called KeyVault in the feed called 'Artifacts' under the project 'IaC'.
+#>
+function Publish-ModuleToUniversalArtifactFeed {
+
+    [CmdletBinding(SupportsShouldProcess)]
+    param (
+        [Parameter(Mandatory)]
+        [string] $TemplateFilePath,
+
+        [Parameter(Mandatory)]
+        [string] $VstsOrganization,
+
+        [Parameter(Mandatory = $false)]
+        [string] $VstsFeedProject = '',
+
+        [Parameter(Mandatory)]
+        [string] $VstsFeedName,
+
+        [Parameter(Mandatory = $false)]
+        [string] $Token = $env:TOKEN,
+
+        [Parameter(Mandatory)]
+        [string] $ModuleVersion
+    )
+
+    begin {
+        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
+    }
+
+    process {
+
+        #################################
+        ##    Generate package name    ##
+        #################################
+
+        # Universal package names => lowercase alphanumerics, dashes, dots or underscores, under 256 characters.
+        # 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' => 'microsoft.keyvault.vaults'
+        $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
+        $universalPackageModuleName = $ModuleFolderPath.Replace('\', '/').Split('/arm/')[1]
+        $universalPackageModuleName = ($universalPackageModuleName.Replace('\', '.').Replace('/', '.').toLower() -Replace '[^a-z0-9\.\-_]')[0..255] -join ''
+        Write-Verbose "The universal package name is [$universalPackageModuleName]" -Verbose
+
+        ###########################
+        ##    Find feed scope    ##
+        ###########################
+        $feedScope = 'organization'
+
+        if ([string]::IsNullOrEmpty($VstsFeedProject)) {
+            $feedScope = 'project'
+        }
+        Write-Verbose "The package feed scope is [$feedScope]" -Verbose
+
+        #############################################
+        ##    Publish to Universal Package Feed    ##
+        #############################################
+        if ($PSCmdlet.ShouldProcess("Universal Package Feed entry [$universalPackageModuleName] version [$ModuleVersion] to feed [$VstsOrganization/$VstsFeedProject/$VstsFeedName]", 'Publish')) {
+            "$Token" | az devops login
+            $inputObject = @(
+                '--organization', "'$VstsOrganization'",
+                '--feed', "'$VstsFeedName'",
+                '--scope', "'$feedScope'",
+                '--name', "'$universalPackageModuleName'",
+                '--version', "'$ModuleVersion'",
+                '--path', "'$ModuleFolderPath'",
+                '--description', "'$universalPackageModuleName Module'",
+                '--verbose'
+            )
+            if (![string]::IsNullOrEmpty($VstsFeedProject)) {
+                $inputObject += @('--project', "'$VstsFeedProject'")
+            }
+
+            Write-Verbose 'The command to publish to the feed is:' -Verbose
+            $command = "az artifacts universal publish $($inputObject -join ' ')"
+
+            Invoke-Expression -Command $command
+
+        }
+        Write-Verbose 'Publish complete'
+    }
+
+    end {
+        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
+    }
+}

From d2774e55df0533de702a19a0beaad2d70e09c7ff Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 14:12:22 +0100
Subject: [PATCH 058/121] Remove unreferences file

---
 .../Initialize-UniversalArtifactPublish.ps1   | 149 ------------------
 1 file changed, 149 deletions(-)
 delete mode 100644 utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1

diff --git a/utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1 b/utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1
deleted file mode 100644
index a1175e1775..0000000000
--- a/utilities/pipelines/resourcePublish/Initialize-UniversalArtifactPublish.ps1
+++ /dev/null
@@ -1,149 +0,0 @@
-<#
-.SYNOPSIS
-Prepare to publish a module as an universal package to a DevOps artifact feed
-
-.DESCRIPTION
-Prepare to publish a module as an universal package to a DevOps artifact feed
-The function will take evaluate which version should be published based on the provided input parameters (CustomVersion, VersioningOption) and the version currently deployed to the feed
-The CustomVersion is considered only if it is higher than the latest version deployed to the artifact feed
-Otherwise, one of the provided version options is chosen and applied with the default being 'patch'
-
-The function returns
-- the name of the artifact to publish
-- the version option to be applied if applicable
-- the version to be applied if applicable
-
-.PARAMETER TemplateFilePath
-Mandatory. Path to the module deployment file from root.
-
-.PARAMETER VstsOrganization
-Mandatory. Name of the organization hosting the artifacts feed.
-
-.PARAMETER VstsProject
-Optional. Name of the project hosting the artifacts feed. May be empty.
-
-.PARAMETER BearerToken
-Optional. The bearer token to use to authenticate the request. If not provided it MUST be existing in your environment as `$env:TOKEN`
-
-.PARAMETER VstsFeedName
-Mandatory. Name to the feed to publish to.
-
-.PARAMETER CustomVersion
-Optional. A custom version the can be provided as a value in the pipeline file.
-
-.PARAMETER VersioningOption
-Optional. A version option that can be specified in the UI. Defaults to 'patch'
-
-.EXAMPLE
-Initialize-UniversalArtifactPublish -TemplateFilePath 'C:/KeyVault/deploy.json' -VstsOrganization 'servicescode' -VstsProject '$(System.TeamProject)' -VstsFeedName 'Modules' -CustomVersion '3.0.0'
-
-Try to publish the key vault module with version 3.0.0 to the module feed 'servicescode/$(System.TeamProject)/Modules' based on a value provided in the UI
-
-.EXAMPLE
-Initialize-UniversalArtifactPublish -TemplateFilePath 'C:/KeyVault/deploy.json' -VstsOrganization 'servicescode' -VstsProject '$(System.TeamProject)' -VstsFeedName 'Modules' -CustomVersion '1.0.0'
-
-Try to publish the key vault module with version 1.0.0 to the module feed 'servicescode/$(System.TeamProject)/Modules' based on a value provided in the pipeline file
-
-.EXAMPLE
-Initialize-UniversalArtifactPublish -TemplateFilePath 'C:/KeyVault/deploy.json' -VstsOrganization 'servicescode' -VstsProject '$(System.TeamProject)' -VstsFeedName 'Modules'
-
-Try to publish the next key vault module version to the module feed 'servicescode/$(System.TeamProject)/Modules' based on the default versioning behavior
-#>
-function Initialize-UniversalArtifactPublish {
-
-    [CmdletBinding()]
-    param (
-        [Parameter(Mandatory)]
-        [string] $TemplateFilePath,
-
-        [Parameter(Mandatory)]
-        [string] $VstsOrganization,
-
-        [Parameter(Mandatory = $false)]
-        [string] $VstsProject = '',
-
-        [Parameter(Mandatory)]
-        [string] $VstsFeedName,
-
-        [Parameter(Mandatory = $false)]
-        [string] $BearerToken = $env:TOKEN,
-
-        [Parameter(Mandatory = $false)]
-        [string] $CustomVersion = '0.0.1',
-
-        [Parameter(Mandatory = $false)]
-        [ValidateSet('Major', 'Minor', 'Patch', 'Custom')]
-        [string] $VersioningOption = 'Patch'
-    )
-
-    begin {
-        Write-Debug ('{0} entered' -f $MyInvocation.MyCommand)
-    }
-
-    process {
-        # For function output
-        $resultSet = @{}
-
-        $moduleIdentifier = (Split-Path $TemplateFilePath -Parent).Replace('\', '/').Split('/arm/')[1]
-        $universalPackageModuleName = $moduleIdentifier.Replace('\', '/').Replace('/', '.').ToLower()
-        $resultSet['universalPackageModuleName'] = $universalPackageModuleName
-
-        #################################
-        ##    FIND AVAILABLE VERSION   ##
-        #################################
-        try {
-            $head = @{ Authorization = "Bearer $BearerToken" }
-            $url = "https://feeds.dev.azure.com/$VstsOrganization/{0}_apis/packaging/Feeds/$VstsFeedName/packages?packageNameQuery=$universalPackageModuleName&api-version=6.0-preview" -f ([String]::IsNullOrEmpty($VstsProject) ? '/' : "$VstsProject/")
-            $packages = Invoke-RestMethod -Uri $url -Method Get -Headers $head -ContentType application/json
-            if ($packages) {
-                if ($packages.value.ID.count -gt 1) {
-                    # Handle the case where multiple modules in the feed start with with the same packageName. In this case we have to filter the result of the REST query even further.
-                    $packages.value = $packages.value | Where-Object { $_.Name -eq $universalPackageModuleName }
-                }
-
-                $latestFeedVersion = ($packages.value.versions.Where( { $_.isLatest -eq $True })).version
-                Write-Verbose ('Package ID of [{0}] is [{1}]' -f $universalPackageModuleName, $packages.value.ID) -Verbose
-                Write-Verbose "The latest version is [$latestFeedVersion]" -Verbose
-            } else {
-                Write-Verbose "No packages via url [$url] found" -Verbose
-            }
-        } catch {
-            $_
-        }
-
-        ############################
-        ##    EVALUATE VERSION    ##
-        ############################
-
-        if ([String]::IsNullOrEmpty($latestFeedVersion)) {
-            Write-Verbose ('No version for module [{0}] found in feed [{1}]. Assuming intial publish' -f $universalPackageModuleName, $VstsFeedName) -Verbose
-            $latestFeedVersion = New-Object System.Version('0.0.1')
-        } elseif (-not (([String]::IsNullOrEmpty($CustomVersion)) -or ([String]::IsNullOrEmpty($latestFeedVersion))) -and ((New-Object System.Version($CustomVersion)) -gt (New-Object System.Version($latestFeedVersion))) ) {
-            Write-Verbose "A custom version [$CustomVersion] was specified in the pipeline script and is higher than the current latest. Using it." -Verbose
-            $VersioningOption = 'custom'
-            $newVersion = $CustomVersion
-        } else {
-            Write-Verbose 'No custom version set. Using default versioning.'
-        }
-
-        # Test if mode custom
-        # -------------------
-        if ($VersioningOption -eq 'custom') {
-            $newVersionObject = New-Object System.Version($newVersion)
-            $latestFeedVersionObject = New-Object System.Version($latestFeedVersion)
-            if ($newVersionObject -lt $latestFeedVersionObject -or $newVersionObject -eq $latestFeedVersionObject) {
-                throw ('The provided custom version [{0}] must be higher than the current latest version [{1}] published in the artifacts feed [{2}]' -f $newVersionObject.ToString(), $latestFeedVersionObject.ToString(), $VstsFeedName)
-            }
-            Write-Verbose "Using publish version [$newVersionObject]" -Verbose
-            $resultSet['newVersionObject'] = $newVersionObject
-        }
-        Write-Verbose "Using publish mode [$VersioningOption]" -Verbose
-        $resultSet['publishingMode'] = $VersioningOption
-
-        return $resultSet
-    }
-
-    end {
-        Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
-    }
-}

From 78048cad65317600d2580d5479a33ebc7e2f4d96 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 14:18:21 +0100
Subject: [PATCH 059/121] cleanup

---
 .../ms.servicefabric.clusters.yml             | 23 +++++--------------
 .../templates/getWorkflowInput/action.yml     | 12 ----------
 .../scripts/Get-WorkflowDefaultInput.ps1      | 11 +--------
 .github/workflows/ms.compute.disks.yml        |  2 --
 .../workflows/ms.network.firewallpolicies.yml |  2 --
 .../workflows/ms.servicefabric.clusters.yml   |  2 --
 .../workflows/ms.synapse.privatelinkhubs.yml  |  2 --
 7 files changed, 7 insertions(+), 47 deletions(-)

diff --git a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
index 8e474d6696..eca56f1d7f 100644
--- a/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
+++ b/.azuredevops/modulePipelines/ms.servicefabric.clusters.yml
@@ -5,18 +5,10 @@ parameters:
     displayName: Remove deployed module
     type: boolean
     default: true
-  - name: versioningOption
-    displayName: The mode to handle the version increments [major|minor|patch]
-    type: string
-    default: patch
-    values:
-      - patch
-      - minor
-      - major
-  - name: customVersion
-    displayName: Custom version to apply. Used only if higher than latest
-    type: string
-    default: '0.0.1'
+  - name: prerelease
+    displayName: Publish prerelease module
+    type: boolean
+    default: false
 
 trigger:
   batch: true
@@ -55,9 +47,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
-      - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml
-        parameters:
-          versioningOption: '${{ parameters.versioningOption }}'
-          customVersion: '${{ parameters.customVersion }}'
+      - template: /.azuredevops/pipelineTemplates/jobs.publishModule.yml
diff --git a/.github/actions/templates/getWorkflowInput/action.yml b/.github/actions/templates/getWorkflowInput/action.yml
index b7019b919d..398f57d545 100644
--- a/.github/actions/templates/getWorkflowInput/action.yml
+++ b/.github/actions/templates/getWorkflowInput/action.yml
@@ -10,12 +10,6 @@ outputs:
   removeDeployment:
     description: 'Remove deployed module'
     value: ${{ steps.get-input-param-action.outputs.removeDeployment }}
-  versioningOption:
-    description: 'The mode to handle the version increments [major|minor|patch]'
-    value: ${{ steps.get-input-param-action.outputs.versioningOption }}
-  customVersion:
-    description: 'Custom version to apply. Used only if higher than latest'
-    value: ${{ steps.get-input-param-action.outputs.customVersion }}
 
 runs:
   using: 'composite'
@@ -29,8 +23,6 @@ runs:
         if ('${{ github.event_name }}' -eq 'workflow_dispatch') {
 
           $removeDeployment='${{ github.event.inputs.removeDeployment }}'
-          $versioningOption='${{ github.event.inputs.versioningOption }}'
-          $customVersion='${{ github.event.inputs.customVersion }}'
         }
         # Otherwise retrieve default values
         else {
@@ -46,12 +38,8 @@ runs:
 
           $workflowParameters = Get-WorkflowDefaultInput @functionInput -Verbose
           $removeDeployment = $workflowParameters.removeDeployment
-          $versioningOption = $workflowParameters.versioningOption
-          $customVersion = $workflowParameters.customVersion
         }
 
         # Output values to be accessed by next jobs
         Write-Output "::set-output name=removeDeployment::$removeDeployment"
-        Write-Output "::set-output name=versioningOption::$versioningOption"
-        Write-Output "::set-output name=customVersion::$customVersion"
       shell: pwsh
diff --git a/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1 b/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1
index c7270a4fb2..fde4d6bdb6 100644
--- a/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1
+++ b/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1
@@ -88,6 +88,7 @@ function Get-WorkflowDefaultInput {
             param (
                 [Parameter(Mandatory)]
                 [string] $InputName,
+                
                 [Parameter(Mandatory)]
                 [string[]] $Content
             )
@@ -121,8 +122,6 @@ function Get-WorkflowDefaultInput {
 
         $workflowParameters = @{
             removeDeployment = Get-DefaultValue -InputName 'removeDeployment' -Content $workflowContent -Verbose
-            versioningOption = Get-DefaultValue -InputName 'versioningOption' -Content $workflowContent -Verbose
-            customVersion    = Get-DefaultValue -InputName 'customVersion' -Content $workflowContent -Verbose
         }
 
         Write-Verbose 'Get workflow default input complete'
@@ -135,11 +134,3 @@ function Get-WorkflowDefaultInput {
         Write-Debug ('{0} exited' -f $MyInvocation.MyCommand)
     }
 }
-
-
-$Test = @'
-One
-Two
-Three
-Four
-'@
diff --git a/.github/workflows/ms.compute.disks.yml b/.github/workflows/ms.compute.disks.yml
index 258fc0ef76..ec29541d6e 100644
--- a/.github/workflows/ms.compute.disks.yml
+++ b/.github/workflows/ms.compute.disks.yml
@@ -52,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
diff --git a/.github/workflows/ms.network.firewallpolicies.yml b/.github/workflows/ms.network.firewallpolicies.yml
index a75b188ce2..b66a3aae35 100644
--- a/.github/workflows/ms.network.firewallpolicies.yml
+++ b/.github/workflows/ms.network.firewallpolicies.yml
@@ -52,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
diff --git a/.github/workflows/ms.servicefabric.clusters.yml b/.github/workflows/ms.servicefabric.clusters.yml
index c77759e123..9d70045af7 100644
--- a/.github/workflows/ms.servicefabric.clusters.yml
+++ b/.github/workflows/ms.servicefabric.clusters.yml
@@ -52,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #
diff --git a/.github/workflows/ms.synapse.privatelinkhubs.yml b/.github/workflows/ms.synapse.privatelinkhubs.yml
index 6a2a083f65..83d9a99d31 100644
--- a/.github/workflows/ms.synapse.privatelinkhubs.yml
+++ b/.github/workflows/ms.synapse.privatelinkhubs.yml
@@ -52,8 +52,6 @@ jobs:
           workflowPath: '${{ env.workflowPath}}'
     outputs:
       removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
-      versioningOption: ${{ steps.get-workflow-param.outputs.versioningOption }}
-      customVersion: ${{ steps.get-workflow-param.outputs.customVersion }}
 
   ####################
   #   Pester Tests   #

From 6b46c3b783a61964acce2271d156087781e0c59e Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 15:46:22 +0100
Subject: [PATCH 060/121] testing website

---
 .azuredevops/modulePipelines/ms.web.sites.yml | 30 +++++++++----------
 .../Publish-ModuleToUniversalArtifactFeed.ps1 |  7 +++--
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/.azuredevops/modulePipelines/ms.web.sites.yml b/.azuredevops/modulePipelines/ms.web.sites.yml
index 32c7b7f9ab..e5587130d0 100644
--- a/.azuredevops/modulePipelines/ms.web.sites.yml
+++ b/.azuredevops/modulePipelines/ms.web.sites.yml
@@ -30,22 +30,22 @@ variables:
     value: '/arm/Microsoft.Web/sites'
 
 stages:
-  - stage: Validation
-    displayName: Pester tests
-    jobs:
-      - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
+  # - stage: Validation
+  #   displayName: Pester tests
+  #   jobs:
+  #     - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
 
-  - stage: Deployment
-    displayName: Deployment tests
-    jobs:
-      - template: /.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
-        parameters:
-          removeDeployment: '${{ parameters.removeDeployment }}'
-          deploymentBlocks:
-            - path: $(modulePath)/.parameters/fa.min.parameters.json
-            - path: $(modulePath)/.parameters/fa.parameters.json
-            - path: $(modulePath)/.parameters/wa.min.parameters.json
-            - path: $(modulePath)/.parameters/wa.parameters.json
+  # - stage: Deployment
+  #   displayName: Deployment tests
+  #   jobs:
+  #     - template: /.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
+  #       parameters:
+  #         removeDeployment: '${{ parameters.removeDeployment }}'
+  #         deploymentBlocks:
+  #           - path: $(modulePath)/.parameters/fa.min.parameters.json
+  #           - path: $(modulePath)/.parameters/fa.parameters.json
+  #           - path: $(modulePath)/.parameters/wa.min.parameters.json
+  #           - path: $(modulePath)/.parameters/wa.parameters.json
 
   - stage: Publishing
     displayName: Publish module
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index e4eb77b7c9..651a6ffd73 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -78,7 +78,7 @@ function Publish-ModuleToUniversalArtifactFeed {
         ###########################
         $feedScope = 'organization'
 
-        if ([string]::IsNullOrEmpty($VstsFeedProject)) {
+        if (-not [string]::IsNullOrEmpty($VstsFeedProject)) {
             $feedScope = 'project'
         }
         Write-Verbose "The package feed scope is [$feedScope]" -Verbose
@@ -98,14 +98,15 @@ function Publish-ModuleToUniversalArtifactFeed {
                 '--description', "'$universalPackageModuleName Module'",
                 '--verbose'
             )
-            if (![string]::IsNullOrEmpty($VstsFeedProject)) {
+            if (-not [string]::IsNullOrEmpty($VstsFeedProject)) {
                 $inputObject += @('--project', "'$VstsFeedProject'")
             }
 
             Write-Verbose 'The command to publish to the feed is:' -Verbose
+            Write-Verbose $command -Verbose
             $command = "az artifacts universal publish $($inputObject -join ' ')"
 
-            Invoke-Expression -Command $command
+            az artifacts universal publish @inputObject
 
         }
         Write-Verbose 'Publish complete'

From d2161bd8cf4f27159bc0679bed0948adfa00abe0 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 15:50:39 +0100
Subject: [PATCH 061/121] Update Sites with empty line :D

---
 arm/Microsoft.Web/sites/deploy.bicep | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arm/Microsoft.Web/sites/deploy.bicep b/arm/Microsoft.Web/sites/deploy.bicep
index 3f56a501a5..309032b427 100644
--- a/arm/Microsoft.Web/sites/deploy.bicep
+++ b/arm/Microsoft.Web/sites/deploy.bicep
@@ -34,6 +34,7 @@ param storageAccountId string = ''
 ])
 param functionsWorkerRuntime string = ''
 
+
 @description('Optional. Version if the function extension.')
 param functionsExtensionVersion string = '~3'
 

From 43a7b3b354e7d90922750d70fb4b6f6e06542d05 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 15:55:21 +0100
Subject: [PATCH 062/121] Fix token -> Bearertoken

---
 .../resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index 651a6ffd73..fe56cb26b3 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -50,7 +50,7 @@ function Publish-ModuleToUniversalArtifactFeed {
         [string] $VstsFeedName,
 
         [Parameter(Mandatory = $false)]
-        [string] $Token = $env:TOKEN,
+        [string] $BearerToken = $env:TOKEN,
 
         [Parameter(Mandatory)]
         [string] $ModuleVersion
@@ -87,7 +87,7 @@ function Publish-ModuleToUniversalArtifactFeed {
         ##    Publish to Universal Package Feed    ##
         #############################################
         if ($PSCmdlet.ShouldProcess("Universal Package Feed entry [$universalPackageModuleName] version [$ModuleVersion] to feed [$VstsOrganization/$VstsFeedProject/$VstsFeedName]", 'Publish')) {
-            "$Token" | az devops login
+            "$BearerToken" | az devops login
             $inputObject = @(
                 '--organization', "'$VstsOrganization'",
                 '--feed', "'$VstsFeedName'",

From b0c54b5480bed835e6d1d1366e7f9bd84d6bbbb3 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 15:57:11 +0100
Subject: [PATCH 063/121] ...

---
 arm/Microsoft.Web/sites/deploy.bicep | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arm/Microsoft.Web/sites/deploy.bicep b/arm/Microsoft.Web/sites/deploy.bicep
index 309032b427..3f56a501a5 100644
--- a/arm/Microsoft.Web/sites/deploy.bicep
+++ b/arm/Microsoft.Web/sites/deploy.bicep
@@ -34,7 +34,6 @@ param storageAccountId string = ''
 ])
 param functionsWorkerRuntime string = ''
 
-
 @description('Optional. Version if the function extension.')
 param functionsExtensionVersion string = '~3'
 

From f986bd75d6e2db3731bce300ce787572ce313dcc Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 16:04:25 +0100
Subject: [PATCH 064/121] Test

---
 arm/Microsoft.Web/sites/deploy.bicep                            | 1 +
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1     | 2 ++
 .../resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arm/Microsoft.Web/sites/deploy.bicep b/arm/Microsoft.Web/sites/deploy.bicep
index 3f56a501a5..309032b427 100644
--- a/arm/Microsoft.Web/sites/deploy.bicep
+++ b/arm/Microsoft.Web/sites/deploy.bicep
@@ -34,6 +34,7 @@ param storageAccountId string = ''
 ])
 param functionsWorkerRuntime string = ''
 
+
 @description('Optional. Version if the function extension.')
 param functionsExtensionVersion string = '~3'
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index d4db798d06..918ff1afe7 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -301,8 +301,10 @@ function Get-NewModuleVersion {
     $NewVersion = "$Version.$Patch"
 
     $CurrentBranch = git branch --show-current
+    Write-Verbose "Current branch: $CurrentBranch" -Verbose
     if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
         $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
+        Write-Verbose "PreRelease: $PreRelease" -Verbose
         $NewVersion = "$NewVersion-Preview-$PreRelease"
     }
 
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index fe56cb26b3..7385602a26 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -87,7 +87,7 @@ function Publish-ModuleToUniversalArtifactFeed {
         ##    Publish to Universal Package Feed    ##
         #############################################
         if ($PSCmdlet.ShouldProcess("Universal Package Feed entry [$universalPackageModuleName] version [$ModuleVersion] to feed [$VstsOrganization/$VstsFeedProject/$VstsFeedName]", 'Publish')) {
-            "$BearerToken" | az devops login
+            $env:AZURE_DEVOPS_EXT_PAT = $BearerToken
             $inputObject = @(
                 '--organization', "'$VstsOrganization'",
                 '--feed', "'$VstsFeedName'",

From cca93cac79fdc695119b90b25af928ea83d894f6 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 16:31:33 +0100
Subject: [PATCH 065/121] Test new branch name

---
 arm/Microsoft.Web/sites/deploy.bicep           |  1 -
 .../resourcePublish/Get-ModulesToUpdate.ps1    |  3 ++-
 .../Publish-ModuleToUniversalArtifactFeed.ps1  | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arm/Microsoft.Web/sites/deploy.bicep b/arm/Microsoft.Web/sites/deploy.bicep
index 309032b427..3f56a501a5 100644
--- a/arm/Microsoft.Web/sites/deploy.bicep
+++ b/arm/Microsoft.Web/sites/deploy.bicep
@@ -34,7 +34,6 @@ param storageAccountId string = ''
 ])
 param functionsWorkerRuntime string = ''
 
-
 @description('Optional. Version if the function extension.')
 param functionsExtensionVersion string = '~3'
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 918ff1afe7..4c79ff6a46 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -300,7 +300,8 @@ function Get-NewModuleVersion {
     $Patch = Get-GitDistance
     $NewVersion = "$Version.$Patch"
 
-    $CurrentBranch = git branch --show-current
+    $CurrentBranch = git symbolic-ref --short HEAD
+    #$CurrentBranch = git branch --show-current
     Write-Verbose "Current branch: $CurrentBranch" -Verbose
     if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
         $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index 7385602a26..516d757873 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -89,22 +89,22 @@ function Publish-ModuleToUniversalArtifactFeed {
         if ($PSCmdlet.ShouldProcess("Universal Package Feed entry [$universalPackageModuleName] version [$ModuleVersion] to feed [$VstsOrganization/$VstsFeedProject/$VstsFeedName]", 'Publish')) {
             $env:AZURE_DEVOPS_EXT_PAT = $BearerToken
             $inputObject = @(
-                '--organization', "'$VstsOrganization'",
-                '--feed', "'$VstsFeedName'",
-                '--scope', "'$feedScope'",
-                '--name', "'$universalPackageModuleName'",
-                '--version', "'$ModuleVersion'",
-                '--path', "'$ModuleFolderPath'",
-                '--description', "'$universalPackageModuleName Module'",
+                '--organization', "$VstsOrganization",
+                '--feed', "$VstsFeedName",
+                '--scope', "$feedScope",
+                '--name', "$universalPackageModuleName",
+                '--version', "$ModuleVersion",
+                '--path', "$ModuleFolderPath",
+                '--description', "$universalPackageModuleName Module",
                 '--verbose'
             )
             if (-not [string]::IsNullOrEmpty($VstsFeedProject)) {
-                $inputObject += @('--project', "'$VstsFeedProject'")
+                $inputObject += @('--project', "$VstsFeedProject")
             }
 
             Write-Verbose 'The command to publish to the feed is:' -Verbose
-            Write-Verbose $command -Verbose
             $command = "az artifacts universal publish $($inputObject -join ' ')"
+            Write-Verbose $command -Verbose
 
             az artifacts universal publish @inputObject
 

From 231f2c7568078d8649d31c6693fe003f7bb4a130 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 16:33:47 +0100
Subject: [PATCH 066/121] Test analysis services

---
 .../ms.analysisservices.servers.yml           |  26 ++--
 .azuredevops/modulePipelines/ms.web.sites.yml |  30 ++--
 .../workflows/ms.analysisservices.servers.yml | 136 +++++++++---------
 .../servers/deploy.bicep                      |   1 +
 4 files changed, 97 insertions(+), 96 deletions(-)

diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
index 625a1186cf..e7c2f74d6c 100644
--- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
+++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
@@ -30,20 +30,20 @@ variables:
     value: '/arm/Microsoft.AnalysisServices/servers'
 
 stages:
-  - stage: Validation
-    displayName: Pester tests
-    jobs:
-      - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
+  # - stage: Validation
+  #   displayName: Pester tests
+  #   jobs:
+  #     - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
 
-  - stage: Deployment
-    displayName: Deployment tests
-    jobs:
-      - template: /.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
-        parameters:
-          removeDeployment: '${{ parameters.removeDeployment }}'
-          deploymentBlocks:
-            - path: $(modulePath)/.parameters/min.parameters.json
-            - path: $(modulePath)/.parameters/parameters.json
+  # - stage: Deployment
+  #   displayName: Deployment tests
+  #   jobs:
+  #     - template: /.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
+  #       parameters:
+  #         removeDeployment: '${{ parameters.removeDeployment }}'
+  #         deploymentBlocks:
+  #           - path: $(modulePath)/.parameters/min.parameters.json
+  #           - path: $(modulePath)/.parameters/parameters.json
 
   - stage: Publishing
     displayName: Publish module
diff --git a/.azuredevops/modulePipelines/ms.web.sites.yml b/.azuredevops/modulePipelines/ms.web.sites.yml
index e5587130d0..32c7b7f9ab 100644
--- a/.azuredevops/modulePipelines/ms.web.sites.yml
+++ b/.azuredevops/modulePipelines/ms.web.sites.yml
@@ -30,22 +30,22 @@ variables:
     value: '/arm/Microsoft.Web/sites'
 
 stages:
-  # - stage: Validation
-  #   displayName: Pester tests
-  #   jobs:
-  #     - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
+  - stage: Validation
+    displayName: Pester tests
+    jobs:
+      - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
 
-  # - stage: Deployment
-  #   displayName: Deployment tests
-  #   jobs:
-  #     - template: /.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
-  #       parameters:
-  #         removeDeployment: '${{ parameters.removeDeployment }}'
-  #         deploymentBlocks:
-  #           - path: $(modulePath)/.parameters/fa.min.parameters.json
-  #           - path: $(modulePath)/.parameters/fa.parameters.json
-  #           - path: $(modulePath)/.parameters/wa.min.parameters.json
-  #           - path: $(modulePath)/.parameters/wa.parameters.json
+  - stage: Deployment
+    displayName: Deployment tests
+    jobs:
+      - template: /.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
+        parameters:
+          removeDeployment: '${{ parameters.removeDeployment }}'
+          deploymentBlocks:
+            - path: $(modulePath)/.parameters/fa.min.parameters.json
+            - path: $(modulePath)/.parameters/fa.parameters.json
+            - path: $(modulePath)/.parameters/wa.min.parameters.json
+            - path: $(modulePath)/.parameters/wa.parameters.json
 
   - stage: Publishing
     displayName: Publish module
diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
index ac017a39bf..7ac5c67584 100644
--- a/.github/workflows/ms.analysisservices.servers.yml
+++ b/.github/workflows/ms.analysisservices.servers.yml
@@ -34,73 +34,73 @@ env:
   DEPLOYMENT_SP_ID: '${{ secrets.DEPLOYMENT_SP_ID }}'
 
 jobs:
-  ############################
-  #   SET INPUT PARAMETERS   #
-  ############################
-  job_set_workflow_param:
-    runs-on: ubuntu-20.04
-    name: 'Set input parameters to output variables'
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: 'Set input parameters'
-        id: get-workflow-param
-        uses: ./.github/actions/templates/getWorkflowInput
-        with:
-          workflowPath: '${{ env.workflowPath}}'
-    outputs:
-      removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
+  # ############################
+  # #   SET INPUT PARAMETERS   #
+  # ############################
+  # job_set_workflow_param:
+  #   runs-on: ubuntu-20.04
+  #   name: 'Set input parameters to output variables'
+  #   steps:
+  #     - name: 'Checkout'
+  #       uses: actions/checkout@v2
+  #       with:
+  #         fetch-depth: 0
+  #     - name: 'Set input parameters'
+  #       id: get-workflow-param
+  #       uses: ./.github/actions/templates/getWorkflowInput
+  #       with:
+  #         workflowPath: '${{ env.workflowPath}}'
+  #   outputs:
+  #     removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
 
-  ####################
-  #   Pester Tests   #
-  ####################
-  job_module_pester_validation:
-    runs-on: ubuntu-20.04
-    name: 'Pester tests'
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: 'Run tests'
-        uses: ./.github/actions/templates/validateModulePester
-        with:
-          modulePath: '${{ env.modulePath }}'
+  # ####################
+  # #   Pester Tests   #
+  # ####################
+  # job_module_pester_validation:
+  #   runs-on: ubuntu-20.04
+  #   name: 'Pester tests'
+  #   steps:
+  #     - name: 'Checkout'
+  #       uses: actions/checkout@v2
+  #       with:
+  #         fetch-depth: 0
+  #     - name: 'Run tests'
+  #       uses: ./.github/actions/templates/validateModulePester
+  #       with:
+  #         modulePath: '${{ env.modulePath }}'
 
-  ####################
-  # Deployment tests #
-  ####################
-  job_module_deploy_validation:
-    runs-on: ubuntu-20.04
-    name: 'Deployment tests'
-    needs:
-      - job_set_workflow_param
-      - job_module_pester_validation
-    strategy:
-      fail-fast: false
-      matrix:
-        parameterFilePaths: ['min.parameters.json', 'parameters.json']
-    steps:
-      - name: 'Checkout'
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-      - name: Set environment variables
-        uses: deep-mm/set-variables@v1.0
-        with:
-          variableFileName: 'global.variables'
-      - name: 'Using parameter file [${{ matrix.parameterFilePaths }}]'
-        uses: ./.github/actions/templates/validateModuleDeployment
-        with:
-          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
-          location: '${{ env.defaultLocation }}'
-          resourceGroupName: '${{ env.resourceGroupName }}'
-          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
-          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
-          removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}'
+  # ####################
+  # # Deployment tests #
+  # ####################
+  # job_module_deploy_validation:
+  #   runs-on: ubuntu-20.04
+  #   name: 'Deployment tests'
+  #   needs:
+  #     - job_set_workflow_param
+  #     - job_module_pester_validation
+  #   strategy:
+  #     fail-fast: false
+  #     matrix:
+  #       parameterFilePaths: ['min.parameters.json', 'parameters.json']
+  #   steps:
+  #     - name: 'Checkout'
+  #       uses: actions/checkout@v2
+  #       with:
+  #         fetch-depth: 0
+  #     - name: Set environment variables
+  #       uses: deep-mm/set-variables@v1.0
+  #       with:
+  #         variableFileName: 'global.variables'
+  #     - name: 'Using parameter file [${{ matrix.parameterFilePaths }}]'
+  #       uses: ./.github/actions/templates/validateModuleDeployment
+  #       with:
+  #         templateFilePath: '${{ env.modulePath }}/deploy.bicep'
+  #         parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
+  #         location: '${{ env.defaultLocation }}'
+  #         resourceGroupName: '${{ env.resourceGroupName }}'
+  #         subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+  #         managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
+  #         removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}'
 
   ###############
   #   PUBLISH   #
@@ -109,9 +109,9 @@ jobs:
     name: 'Publish module'
     if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
-    needs:
-      - job_set_workflow_param
-      - job_module_deploy_validation
+    # needs:
+    #   - job_set_workflow_param
+    #   - job_module_deploy_validation
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2
diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index c35bd16513..e77e2b14af 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,6 +19,7 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
+
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 

From 464af397f1fabe33c9f8ff64eb12a86a30d83470 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 17:10:16 +0100
Subject: [PATCH 067/121] Update

---
 .azuredevops/pipelineTemplates/jobs.publishModule.yml  |  6 +++---
 .azuredevops/pipelineVariables/global.variables.yml    |  1 +
 arm/Microsoft.AnalysisServices/servers/deploy.bicep    |  1 -
 .../pipelines/resourcePublish/Get-ModulesToUpdate.ps1  |  2 +-
 .../Publish-ModuleToUniversalArtifactFeed.ps1          | 10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.azuredevops/pipelineTemplates/jobs.publishModule.yml b/.azuredevops/pipelineTemplates/jobs.publishModule.yml
index 3a91088dc8..2164e11514 100644
--- a/.azuredevops/pipelineTemplates/jobs.publishModule.yml
+++ b/.azuredevops/pipelineTemplates/jobs.publishModule.yml
@@ -36,7 +36,7 @@
 ##   | bicepRegistryName               | '$(bicepRegistryName)'               | Required to publish to the private bicep registry. Name of the hosting container registry               | 'adpsxxazacrx001'                 |
 ##   | bicepRegistryRGName             | '$(bicepRegistryRGName)'             | Required to publish to the private bicep registry. Resource group of the hosting container registry     | 'artifacts-rg'                    |
 ##   | bicepRegistryRgLocation         | '$(bicepRegistryRgLocation)'         | Required to publish to the private bicep registry. Location of the RG of the hosting container registry | 'West Europe'                     |
-##   | vstsOrganization                | '$(vstsOrganization)'                | Required to publish to a DevOps feed. Name of the organization hosting the artifacts feed.              | 'servicescode'                    |
+##   | vstsOrganizationUri             | '$(vstsOrganizationUri)'             | Required to publish to a DevOps feed. Name of the organization hosting the artifacts feed.              | 'servicescode'                    |
 ##   | azurePowerShellVersion          | '$(azurePowerShellVersion)'          | Used for configuring the Azure PowerShell Version, one of the example values.                           | 'latestVersion' or 'OtherVersion' |
 ##   | preferredAzurePowerShellVersion | '$(preferredAzurePowerShellVersion)' | Used for configuring the Azure PowerShell Version, either an empty string or specific version.          | '4.4.0'                           |
 ##   |======================================================================================================================================================================================================================|
@@ -65,7 +65,7 @@ parameters:
 
   ## Artifact-Feed-related
   artifactsFeedDoPublish: '$(artifactsFeedDoPublish)'
-  vstsOrganization: '$(vstsOrganization)'
+  vstsOrganizationUri: '$(vstsOrganizationUri)'
   vstsFeedProject: '$(vstsFeedProject)'
   vstsFeedName: '$(vstsFeedName)'
   vstsFeedToken: '$(vstsFeedToken)'
@@ -178,7 +178,7 @@ jobs:
             foreach ($ModuleToUpdate in $ModulesToUpdate) {
               $functionInput = @{
                 TemplateFilePath = $ModuleToUpdate.TemplateFilePath
-                VstsOrganization = '${{ parameters.vstsOrganization }}'
+                VstsOrganizationUri = '${{ parameters.vstsOrganizationUri }}'
                 VstsFeedProject  = '${{ parameters.vstsFeedProject }}'
                 VstsFeedName     = '${{ parameters.vstsFeedName }}'
                 ModuleVersion    = $ModuleToUpdate.Version
diff --git a/.azuredevops/pipelineVariables/global.variables.yml b/.azuredevops/pipelineVariables/global.variables.yml
index 2a619c99af..7e790694b8 100644
--- a/.azuredevops/pipelineVariables/global.variables.yml
+++ b/.azuredevops/pipelineVariables/global.variables.yml
@@ -12,6 +12,7 @@ variables:
   ######################################
 
   vstsOrganization: servicescode
+  vstsOrganizationURI: '$(System.CollectionUri)' # The URI of the TFS collection or Azure DevOps organization. For example: https://dev.azure.com/fabrikam/.
   vstsProject: '$(System.TeamProject)'
   modulesRepository: ResourceModules # The repository hosting the deployment code (i.e. 'Components'). MUST be provided as a variable with every pipeline
   modulePath: arm/$(moduleName) # only use in module pipelines
diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index e77e2b14af..c35bd16513 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,7 +19,6 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
-
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 4c79ff6a46..a4edad6fda 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -300,7 +300,7 @@ function Get-NewModuleVersion {
     $Patch = Get-GitDistance
     $NewVersion = "$Version.$Patch"
 
-    $CurrentBranch = git symbolic-ref --short HEAD
+    $CurrentBranch = git symbolic-ref --short 'HEAD'
     #$CurrentBranch = git branch --show-current
     Write-Verbose "Current branch: $CurrentBranch" -Verbose
     if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index 516d757873..f00a84bc66 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -13,7 +13,7 @@ Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
 Required. Version of the module to publish, following SemVer convention.
 Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
 
-.PARAMETER VstsOrganization
+.PARAMETER vstsOrganizationUri
 Mandatory. Azure DevOps organization URL hosting the artifacts feed.
 Example: 'https://dev.azure.com/fabrikam/'.
 
@@ -29,7 +29,7 @@ Example: 'Artifacts'.
 Optional. The bearer token to use to authenticate the request. If not provided it MUST be existing in your environment as `$env:TOKEN`
 
 .EXAMPLE
-Publish-ModuleToUniversalArtifactFeed -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -VstsOrganization 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
+Publish-ModuleToUniversalArtifactFeed -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
 
 Try to publish the KeyVault module with version 3.0.0-alpha to a Universal Package Feed called KeyVault in the feed called 'Artifacts' under the project 'IaC'.
 #>
@@ -41,7 +41,7 @@ function Publish-ModuleToUniversalArtifactFeed {
         [string] $TemplateFilePath,
 
         [Parameter(Mandatory)]
-        [string] $VstsOrganization,
+        [string] $VstsOrganizationUri,
 
         [Parameter(Mandatory = $false)]
         [string] $VstsFeedProject = '',
@@ -86,10 +86,10 @@ function Publish-ModuleToUniversalArtifactFeed {
         #############################################
         ##    Publish to Universal Package Feed    ##
         #############################################
-        if ($PSCmdlet.ShouldProcess("Universal Package Feed entry [$universalPackageModuleName] version [$ModuleVersion] to feed [$VstsOrganization/$VstsFeedProject/$VstsFeedName]", 'Publish')) {
+        if ($PSCmdlet.ShouldProcess("Universal Package Feed entry [$universalPackageModuleName] version [$ModuleVersion] to feed [$VstsOrganizationUri/$VstsFeedProject/$VstsFeedName]", 'Publish')) {
             $env:AZURE_DEVOPS_EXT_PAT = $BearerToken
             $inputObject = @(
-                '--organization', "$VstsOrganization",
+                '--organization', "$VstsOrganizationUri",
                 '--feed', "$VstsFeedName",
                 '--scope', "$feedScope",
                 '--name', "$universalPackageModuleName",

From de06c085ab7aa1298d77693f469dad6c3d3e6412 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 17:24:02 +0100
Subject: [PATCH 068/121] Test

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep         | 1 +
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index c35bd16513..e77e2b14af 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,6 +19,7 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
+
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index a4edad6fda..6845c699ee 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -306,7 +306,8 @@ function Get-NewModuleVersion {
     if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
         $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
         Write-Verbose "PreRelease: $PreRelease" -Verbose
-        $NewVersion = "$NewVersion-Preview-$PreRelease"
+        $NewVersion = "$NewVersion-Preview"
+        #$NewVersion = "$NewVersion-Preview-$PreRelease"
     }
 
     return $NewVersion

From acc3e03142b60a1c682c8ce36eb32e7300b8b2f9 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 17:30:28 +0100
Subject: [PATCH 069/121] test

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep       | 1 -
 .../pipelines/resourcePublish/Get-ModulesToUpdate.ps1     | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index e77e2b14af..c35bd16513 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,7 +19,6 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
-
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 6845c699ee..542b12458d 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -300,9 +300,15 @@ function Get-NewModuleVersion {
     $Patch = Get-GitDistance
     $NewVersion = "$Version.$Patch"
 
+    Write-Verbose "git symbolic-ref --short 'HEAD'"
+    git symbolic-ref --short 'HEAD'
+
+    Write-Verbose "git branch --show-current"
+    git branch --show-current
+
     $CurrentBranch = git symbolic-ref --short 'HEAD'
     #$CurrentBranch = git branch --show-current
-    Write-Verbose "Current branch: $CurrentBranch" -Verbose
+    crrent branch: $CurrentBranch" -Verbose
     if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
         $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
         Write-Verbose "PreRelease: $PreRelease" -Verbose

From 24f13fe2b9952c0a2281d5f19df084ea09a2e913 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 17:34:29 +0100
Subject: [PATCH 070/121] test

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep         | 1 +
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index c35bd16513..e77e2b14af 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,6 +19,7 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
+
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 542b12458d..ac8551e004 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -308,7 +308,7 @@ function Get-NewModuleVersion {
 
     $CurrentBranch = git symbolic-ref --short 'HEAD'
     #$CurrentBranch = git branch --show-current
-    crrent branch: $CurrentBranch" -Verbose
+    Write-Verbose "Current branch: $CurrentBranch" -Verbose
     if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
         $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
         Write-Verbose "PreRelease: $PreRelease" -Verbose

From 58b5d4086281e5c4fb40c9fb47bf2310d6d10c6f Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 17:43:26 +0100
Subject: [PATCH 071/121] test

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep         | 1 -
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index e77e2b14af..c35bd16513 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,7 +19,6 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
-
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index ac8551e004..23977d3f53 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -301,11 +301,14 @@ function Get-NewModuleVersion {
     $NewVersion = "$Version.$Patch"
 
     Write-Verbose "git symbolic-ref --short 'HEAD'"
-    git symbolic-ref --short 'HEAD'
+    git symbolic-ref --short
 
     Write-Verbose "git branch --show-current"
     git branch --show-current
 
+    Write-Verbose "git rev-list"
+    git rev-list
+
     $CurrentBranch = git symbolic-ref --short 'HEAD'
     #$CurrentBranch = git branch --show-current
     Write-Verbose "Current branch: $CurrentBranch" -Verbose

From 2671233b0aa0a4bbbd1e45b51eab8f9f11fb6c30 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 17:57:06 +0100
Subject: [PATCH 072/121] test

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep         | 1 +
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index c35bd16513..e77e2b14af 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,6 +19,7 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
+
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 23977d3f53..9b8b668a9d 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -315,7 +315,7 @@ function Get-NewModuleVersion {
     if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
         $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
         Write-Verbose "PreRelease: $PreRelease" -Verbose
-        $NewVersion = "$NewVersion-Preview"
+        $NewVersion = "$NewVersion-preview".ToLower()
         #$NewVersion = "$NewVersion-Preview-$PreRelease"
     }
 

From f99a9a59d49a020bad46d81185fdba1842d44ca1 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 19:09:39 +0100
Subject: [PATCH 073/121] fix

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index e77e2b14af..c35bd16513 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,7 +19,6 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
-
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 

From f8a78d7fc50f3cea73cf44e2f496133dbd0807e5 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 19:32:38 +0100
Subject: [PATCH 074/121] Test

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index c35bd16513..e77e2b14af 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,6 +19,7 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
+
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 

From 35ec42f272235bc181965deee3279fc7abd46098 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 19:34:14 +0100
Subject: [PATCH 075/121] test

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index e77e2b14af..c35bd16513 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,7 +19,6 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
-
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 

From fdba71f078ffb9e0b1672ce7d9e3f627a01a0cb2 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 19:37:59 +0100
Subject: [PATCH 076/121] test

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index c35bd16513..e77e2b14af 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,6 +19,7 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
+
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 

From a1794699aa7024b148b7f29cec6825b0780a2528 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 19:44:13 +0100
Subject: [PATCH 077/121] testing script

---
 .../resourcePublish/Get-ModulesToUpdate.ps1   | 65 ++++++++++++++++---
 1 file changed, 57 insertions(+), 8 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 9b8b668a9d..baeed82408 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -1,5 +1,22 @@
 #region Helper functions
 
+<#
+.SYNOPSIS
+Get the default branch for the current project.
+
+.DESCRIPTION
+Get the default branch for the current project.
+
+.EXAMPLE
+Get-GitDefaultBranch
+
+main
+
+#>
+function Get-GitDefaultBranch {
+    return (git rev-parse --abbrev-ref origin/HEAD).split('/')[-1]
+}
+
 <#
 .SYNOPSIS
 Get modified files between two commits.
@@ -22,15 +39,13 @@ la---          08.12.2021    15:50           7133 Script.ps1
 Get modified files between previous and current commit.
 #>
 function Get-ModifiedFiles {
-    # TODO: On custom branch this will only compare the last commit, maybe worth testing this with 'main' branch?
-    # https://devconnected.com/how-to-compare-two-git-branches/
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
         [string] $Commit = 'HEAD^',
 
         [Parameter(Mandatory = $false)]
-        [string] $CompareCommit = 'HEAD'
+        [string] $CompareCommit = (Get-GitDefaultBranch)
     )
 
     Write-Verbose "Gathering modified files between [$Commit] and [$CompareCommit]"
@@ -225,10 +240,35 @@ function Get-GitDistance {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
-        [string] $Commit = 'HEAD'
+        [string] $Commit = 'HEAD',
+
+        [Parameter(Mandatory = $false)]
+        [string] $CompareCommit = "^$(Get-GitDefaultBranch)"
     )
 
-    return (git rev-list $Commit --count)
+    #From ^main (first parent) - 79 - 80 - 81 - 82
+    [int](git rev-list --count $Commit ^$(Get-GitDefaultBranch) --first-parent) + 1
+
+    #From main - 92 - 93 - 94 - 95
+    [int](git rev-list --count $Commit ^$(Get-GitDefaultBranch)) + 1
+
+    #From main^ (first parent) - 697 - 698 - 699 - 700
+    [int](git rev-list --count $Commit $(Get-GitDefaultBranch) --first-parent) + 1
+
+    #From main - 797 - 798 - 799
+    [int](git rev-list --count HEAD $(Get-GitDefaultBranch)) + 1
+    [int](git rev-list --count $Commit) + 1
+
+    #On main - 705 - 705
+    [int](git rev-list --count $(Get-GitDefaultBranch)) + 1
+
+    #On main (first parent) - 619 - 619
+    [int](git rev-list --count $(Get-GitDefaultBranch) --first-parent) + 1
+
+    #From origin (first parent) - 420 - 421 - 422 - 423
+    [int](git rev-list --count $Commit --first-parent) + 1
+
+    return [int](git rev-list --count $Commit) + 1
 }
 
 <#
@@ -301,10 +341,19 @@ function Get-NewModuleVersion {
     $NewVersion = "$Version.$Patch"
 
     Write-Verbose "git symbolic-ref --short 'HEAD'"
-    git symbolic-ref --short
+    git symbolic-ref HEAD --short
+
+    Write-Verbose 'git branch HEAD --show-current'
+    git branch HEAD --show-current
+
+    Write-Verbose 'git branch --show-current HEAD'
+    git branch --show-current HEAD
+
+    Write-Verbose "git rev-parse --abbrev-ref HEAD"
+    git rev-parse --abbrev-ref origin/HEAD
 
-    Write-Verbose "git branch --show-current"
-    git branch --show-current
+    Write-Verbose "git rev-parse HEAD --abbrev-ref"
+    git rev-parse HEAD --abbrev-ref
 
     Write-Verbose "git rev-list"
     git rev-list

From 7f9b9135f937795bff156f070e2e38e1f1e054dc Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 19:59:59 +0100
Subject: [PATCH 078/121] fix

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep         | 1 -
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index e77e2b14af..c35bd16513 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,7 +19,6 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
-
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index baeed82408..db2f978e3d 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -14,7 +14,7 @@ main
 
 #>
 function Get-GitDefaultBranch {
-    return (git rev-parse --abbrev-ref origin/HEAD).split('/')[-1]
+    return (git rev-parse --abbrev-ref 'origin/HEAD').split('/')[-1]
 }
 
 <#
@@ -42,7 +42,7 @@ function Get-ModifiedFiles {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
-        [string] $Commit = 'HEAD^',
+        [string] $Commit = 'HEAD',
 
         [Parameter(Mandatory = $false)]
         [string] $CompareCommit = (Get-GitDefaultBranch)

From c2cfdcf8c14ec5ecd3b91e72bc2a3ecf0d81ae33 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 20:14:06 +0100
Subject: [PATCH 079/121] fix

---
 .../resourcePublish/Get-ModulesToUpdate.ps1   | 33 +++++--------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index db2f978e3d..9f9ed6fd35 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -1,22 +1,5 @@
 #region Helper functions
 
-<#
-.SYNOPSIS
-Get the default branch for the current project.
-
-.DESCRIPTION
-Get the default branch for the current project.
-
-.EXAMPLE
-Get-GitDefaultBranch
-
-main
-
-#>
-function Get-GitDefaultBranch {
-    return (git rev-parse --abbrev-ref 'origin/HEAD').split('/')[-1]
-}
-
 <#
 .SYNOPSIS
 Get modified files between two commits.
@@ -45,7 +28,7 @@ function Get-ModifiedFiles {
         [string] $Commit = 'HEAD',
 
         [Parameter(Mandatory = $false)]
-        [string] $CompareCommit = (Get-GitDefaultBranch)
+        [string] $CompareCommit = 'main'
     )
 
     Write-Verbose "Gathering modified files between [$Commit] and [$CompareCommit]"
@@ -243,27 +226,27 @@ function Get-GitDistance {
         [string] $Commit = 'HEAD',
 
         [Parameter(Mandatory = $false)]
-        [string] $CompareCommit = "^$(Get-GitDefaultBranch)"
+        [string] $CompareCommit = "^main"
     )
 
     #From ^main (first parent) - 79 - 80 - 81 - 82
-    [int](git rev-list --count $Commit ^$(Get-GitDefaultBranch) --first-parent) + 1
+    [int](git rev-list --count $Commit ^main --first-parent) + 1
 
     #From main - 92 - 93 - 94 - 95
-    [int](git rev-list --count $Commit ^$(Get-GitDefaultBranch)) + 1
+    [int](git rev-list --count $Commit ^main) + 1
 
     #From main^ (first parent) - 697 - 698 - 699 - 700
-    [int](git rev-list --count $Commit $(Get-GitDefaultBranch) --first-parent) + 1
+    [int](git rev-list --count $Commit main --first-parent) + 1
 
     #From main - 797 - 798 - 799
-    [int](git rev-list --count HEAD $(Get-GitDefaultBranch)) + 1
+    [int](git rev-list --count HEAD main) + 1
     [int](git rev-list --count $Commit) + 1
 
     #On main - 705 - 705
-    [int](git rev-list --count $(Get-GitDefaultBranch)) + 1
+    [int](git rev-list --count main) + 1
 
     #On main (first parent) - 619 - 619
-    [int](git rev-list --count $(Get-GitDefaultBranch) --first-parent) + 1
+    [int](git rev-list --count main --first-parent) + 1
 
     #From origin (first parent) - 420 - 421 - 422 - 423
     [int](git rev-list --count $Commit --first-parent) + 1

From 4a67f2d536622a7d40b9685b70df609eb6f0254d Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 20:40:23 +0100
Subject: [PATCH 080/121] test

---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 9f9ed6fd35..323e3b4c8b 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -28,7 +28,7 @@ function Get-ModifiedFiles {
         [string] $Commit = 'HEAD',
 
         [Parameter(Mandatory = $false)]
-        [string] $CompareCommit = 'main'
+        [string] $CompareCommit = 'refs/remote/origin/main'
     )
 
     Write-Verbose "Gathering modified files between [$Commit] and [$CompareCommit]"

From 5c3fb2a10ff4c122ca4268cf61079b74f00d2301 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 20:43:27 +0100
Subject: [PATCH 081/121] add debug

---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 323e3b4c8b..39fcdb66bf 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -28,9 +28,11 @@ function Get-ModifiedFiles {
         [string] $Commit = 'HEAD',
 
         [Parameter(Mandatory = $false)]
-        [string] $CompareCommit = 'refs/remote/origin/main'
+        [string] $CompareCommit = 'main'
     )
 
+    git branch -a
+
     Write-Verbose "Gathering modified files between [$Commit] and [$CompareCommit]"
     $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
     $ModifiedFiles = $Diff | Get-Item

From 3cafeb7c76967848b70771950478b1cc30219b7a Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 20:48:28 +0100
Subject: [PATCH 082/121] Testing

---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 39fcdb66bf..e518aa2996 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -28,11 +28,9 @@ function Get-ModifiedFiles {
         [string] $Commit = 'HEAD',
 
         [Parameter(Mandatory = $false)]
-        [string] $CompareCommit = 'main'
+        [string] $CompareCommit = ''
     )
 
-    git branch -a
-
     Write-Verbose "Gathering modified files between [$Commit] and [$CompareCommit]"
     $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
     $ModifiedFiles = $Diff | Get-Item
@@ -381,6 +379,8 @@ function Get-ModulesToUpdate {
         [string] $TemplateFilePath
     )
 
+    git branch -a
+
     $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
     $TemplateFilesToUpdate = Get-TemplateFileToUpdate -ModuleFolderPath $ModuleFolderPath | Sort-Object FullName -Descending
 

From da80b2fb6ea4c797c1b13cf3accb7b143c6b5e55 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 20:53:48 +0100
Subject: [PATCH 083/121] test

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep         | 1 +
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index c35bd16513..e77e2b14af 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,6 +19,7 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
+
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index e518aa2996..27dc8bbf97 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -22,13 +22,14 @@ la---          08.12.2021    15:50           7133 Script.ps1
 Get modified files between previous and current commit.
 #>
 function Get-ModifiedFiles {
+    # BUG: When developing, the current logic will require you to modify the deploy.bicep/json file for it to register the change.
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
         [string] $Commit = 'HEAD',
 
         [Parameter(Mandatory = $false)]
-        [string] $CompareCommit = ''
+        [string] $CompareCommit = 'HEAD^'
     )
 
     Write-Verbose "Gathering modified files between [$Commit] and [$CompareCommit]"

From 1729948f88f174fd5c99ec6e3b36e4774e55dda4 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 21:02:21 +0100
Subject: [PATCH 084/121] test

---
 .../servers/deploy.bicep                      |  1 -
 .../resourcePublish/Get-ModulesToUpdate.ps1   | 26 +------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index e77e2b14af..c35bd16513 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,7 +19,6 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
-
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 27dc8bbf97..e4cc86b2e6 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -224,34 +224,10 @@ function Get-GitDistance {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
-        [string] $Commit = 'HEAD',
+        [string] $Commit = 'HEAD'
 
-        [Parameter(Mandatory = $false)]
-        [string] $CompareCommit = "^main"
     )
 
-    #From ^main (first parent) - 79 - 80 - 81 - 82
-    [int](git rev-list --count $Commit ^main --first-parent) + 1
-
-    #From main - 92 - 93 - 94 - 95
-    [int](git rev-list --count $Commit ^main) + 1
-
-    #From main^ (first parent) - 697 - 698 - 699 - 700
-    [int](git rev-list --count $Commit main --first-parent) + 1
-
-    #From main - 797 - 798 - 799
-    [int](git rev-list --count HEAD main) + 1
-    [int](git rev-list --count $Commit) + 1
-
-    #On main - 705 - 705
-    [int](git rev-list --count main) + 1
-
-    #On main (first parent) - 619 - 619
-    [int](git rev-list --count main --first-parent) + 1
-
-    #From origin (first parent) - 420 - 421 - 422 - 423
-    [int](git rev-list --count $Commit --first-parent) + 1
-
     return [int](git rev-list --count $Commit) + 1
 }
 

From 525ff950cf337a239f71d97456ae0dac71d34864 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 21:11:24 +0100
Subject: [PATCH 085/121] test

---
 .../servers/deploy.bicep                      |  1 +
 .../resourcePublish/Get-ModulesToUpdate.ps1   | 25 +++----------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index c35bd16513..e77e2b14af 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,6 +19,7 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
+
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index e4cc86b2e6..35b7e38d10 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -300,32 +300,15 @@ function Get-NewModuleVersion {
     $Patch = Get-GitDistance
     $NewVersion = "$Version.$Patch"
 
-    Write-Verbose "git symbolic-ref --short 'HEAD'"
-    git symbolic-ref HEAD --short
-
-    Write-Verbose 'git branch HEAD --show-current'
-    git branch HEAD --show-current
-
-    Write-Verbose 'git branch --show-current HEAD'
-    git branch --show-current HEAD
-
-    Write-Verbose "git rev-parse --abbrev-ref HEAD"
-    git rev-parse --abbrev-ref origin/HEAD
-
-    Write-Verbose "git rev-parse HEAD --abbrev-ref"
-    git rev-parse HEAD --abbrev-ref
-
-    Write-Verbose "git rev-list"
-    git rev-list
-
     $CurrentBranch = git symbolic-ref --short 'HEAD'
     #$CurrentBranch = git branch --show-current
-    Write-Verbose "Current branch: $CurrentBranch" -Verbose
+    Write-Verbose "Current branch: [$CurrentBranch]" -Verbose
     if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
         $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
-        Write-Verbose "PreRelease: $PreRelease" -Verbose
+        Write-Verbose "PreRelease: [$PreRelease]" -Verbose
         $NewVersion = "$NewVersion-preview".ToLower()
         #$NewVersion = "$NewVersion-Preview-$PreRelease"
+        Write-Verbose "New version: [$NewVersion]" -Verbose
     }
 
     return $NewVersion
@@ -356,8 +339,6 @@ function Get-ModulesToUpdate {
         [string] $TemplateFilePath
     )
 
-    git branch -a
-
     $ModuleFolderPath = Split-Path $TemplateFilePath -Parent
     $TemplateFilesToUpdate = Get-TemplateFileToUpdate -ModuleFolderPath $ModuleFolderPath | Sort-Object FullName -Descending
 

From fe76c3374ff089e8b01e52f5a087c6e1a73a97bc Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 21:22:10 +0100
Subject: [PATCH 086/121] set prerelease tag to be 'prerelease'

---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 35b7e38d10..6c2e39313d 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -306,8 +306,8 @@ function Get-NewModuleVersion {
     if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
         $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
         Write-Verbose "PreRelease: [$PreRelease]" -Verbose
-        $NewVersion = "$NewVersion-preview".ToLower()
-        #$NewVersion = "$NewVersion-Preview-$PreRelease"
+        $NewVersion = "$NewVersion-prerelease".ToLower()
+        #$NewVersion = "$NewVersion-prerelease-$PreRelease"
         Write-Verbose "New version: [$NewVersion]" -Verbose
     }
 

From 1366b813296631fc82e743e8f4722907e00910cb Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Wed, 26 Jan 2022 23:15:28 +0100
Subject: [PATCH 087/121] cleanup comment on workflow files

---
 .../ms.analysisservices.servers.yml           |  26 ++--
 .../workflows/ms.analysisservices.servers.yml | 136 +++++++++---------
 2 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
index e7c2f74d6c..625a1186cf 100644
--- a/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
+++ b/.azuredevops/modulePipelines/ms.analysisservices.servers.yml
@@ -30,20 +30,20 @@ variables:
     value: '/arm/Microsoft.AnalysisServices/servers'
 
 stages:
-  # - stage: Validation
-  #   displayName: Pester tests
-  #   jobs:
-  #     - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
+  - stage: Validation
+    displayName: Pester tests
+    jobs:
+      - template: /.azuredevops/pipelineTemplates/jobs.validateModulePester.yml
 
-  # - stage: Deployment
-  #   displayName: Deployment tests
-  #   jobs:
-  #     - template: /.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
-  #       parameters:
-  #         removeDeployment: '${{ parameters.removeDeployment }}'
-  #         deploymentBlocks:
-  #           - path: $(modulePath)/.parameters/min.parameters.json
-  #           - path: $(modulePath)/.parameters/parameters.json
+  - stage: Deployment
+    displayName: Deployment tests
+    jobs:
+      - template: /.azuredevops/pipelineTemplates/jobs.validateModuleDeployment.yml
+        parameters:
+          removeDeployment: '${{ parameters.removeDeployment }}'
+          deploymentBlocks:
+            - path: $(modulePath)/.parameters/min.parameters.json
+            - path: $(modulePath)/.parameters/parameters.json
 
   - stage: Publishing
     displayName: Publish module
diff --git a/.github/workflows/ms.analysisservices.servers.yml b/.github/workflows/ms.analysisservices.servers.yml
index 7ac5c67584..ac017a39bf 100644
--- a/.github/workflows/ms.analysisservices.servers.yml
+++ b/.github/workflows/ms.analysisservices.servers.yml
@@ -34,73 +34,73 @@ env:
   DEPLOYMENT_SP_ID: '${{ secrets.DEPLOYMENT_SP_ID }}'
 
 jobs:
-  # ############################
-  # #   SET INPUT PARAMETERS   #
-  # ############################
-  # job_set_workflow_param:
-  #   runs-on: ubuntu-20.04
-  #   name: 'Set input parameters to output variables'
-  #   steps:
-  #     - name: 'Checkout'
-  #       uses: actions/checkout@v2
-  #       with:
-  #         fetch-depth: 0
-  #     - name: 'Set input parameters'
-  #       id: get-workflow-param
-  #       uses: ./.github/actions/templates/getWorkflowInput
-  #       with:
-  #         workflowPath: '${{ env.workflowPath}}'
-  #   outputs:
-  #     removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
+  ############################
+  #   SET INPUT PARAMETERS   #
+  ############################
+  job_set_workflow_param:
+    runs-on: ubuntu-20.04
+    name: 'Set input parameters to output variables'
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: 'Set input parameters'
+        id: get-workflow-param
+        uses: ./.github/actions/templates/getWorkflowInput
+        with:
+          workflowPath: '${{ env.workflowPath}}'
+    outputs:
+      removeDeployment: ${{ steps.get-workflow-param.outputs.removeDeployment }}
 
-  # ####################
-  # #   Pester Tests   #
-  # ####################
-  # job_module_pester_validation:
-  #   runs-on: ubuntu-20.04
-  #   name: 'Pester tests'
-  #   steps:
-  #     - name: 'Checkout'
-  #       uses: actions/checkout@v2
-  #       with:
-  #         fetch-depth: 0
-  #     - name: 'Run tests'
-  #       uses: ./.github/actions/templates/validateModulePester
-  #       with:
-  #         modulePath: '${{ env.modulePath }}'
+  ####################
+  #   Pester Tests   #
+  ####################
+  job_module_pester_validation:
+    runs-on: ubuntu-20.04
+    name: 'Pester tests'
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: 'Run tests'
+        uses: ./.github/actions/templates/validateModulePester
+        with:
+          modulePath: '${{ env.modulePath }}'
 
-  # ####################
-  # # Deployment tests #
-  # ####################
-  # job_module_deploy_validation:
-  #   runs-on: ubuntu-20.04
-  #   name: 'Deployment tests'
-  #   needs:
-  #     - job_set_workflow_param
-  #     - job_module_pester_validation
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       parameterFilePaths: ['min.parameters.json', 'parameters.json']
-  #   steps:
-  #     - name: 'Checkout'
-  #       uses: actions/checkout@v2
-  #       with:
-  #         fetch-depth: 0
-  #     - name: Set environment variables
-  #       uses: deep-mm/set-variables@v1.0
-  #       with:
-  #         variableFileName: 'global.variables'
-  #     - name: 'Using parameter file [${{ matrix.parameterFilePaths }}]'
-  #       uses: ./.github/actions/templates/validateModuleDeployment
-  #       with:
-  #         templateFilePath: '${{ env.modulePath }}/deploy.bicep'
-  #         parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
-  #         location: '${{ env.defaultLocation }}'
-  #         resourceGroupName: '${{ env.resourceGroupName }}'
-  #         subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
-  #         managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
-  #         removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}'
+  ####################
+  # Deployment tests #
+  ####################
+  job_module_deploy_validation:
+    runs-on: ubuntu-20.04
+    name: 'Deployment tests'
+    needs:
+      - job_set_workflow_param
+      - job_module_pester_validation
+    strategy:
+      fail-fast: false
+      matrix:
+        parameterFilePaths: ['min.parameters.json', 'parameters.json']
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set environment variables
+        uses: deep-mm/set-variables@v1.0
+        with:
+          variableFileName: 'global.variables'
+      - name: 'Using parameter file [${{ matrix.parameterFilePaths }}]'
+        uses: ./.github/actions/templates/validateModuleDeployment
+        with:
+          templateFilePath: '${{ env.modulePath }}/deploy.bicep'
+          parameterFilePath: '${{ env.modulePath }}/.parameters/${{ matrix.parameterFilePaths }}'
+          location: '${{ env.defaultLocation }}'
+          resourceGroupName: '${{ env.resourceGroupName }}'
+          subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}'
+          managementGroupId: '${{ secrets.ARM_MGMTGROUP_ID }}'
+          removeDeployment: '${{ needs.job_set_workflow_param.outputs.removeDeployment }}'
 
   ###############
   #   PUBLISH   #
@@ -109,9 +109,9 @@ jobs:
     name: 'Publish module'
     if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || github.event.inputs.prerelease == 'true'
     runs-on: ubuntu-20.04
-    # needs:
-    #   - job_set_workflow_param
-    #   - job_module_deploy_validation
+    needs:
+      - job_set_workflow_param
+      - job_module_deploy_validation
     steps:
       - name: 'Checkout'
         uses: actions/checkout@v2

From 1915457ba816dbdde946353dba7bb2214c9d7017 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:49:49 +0100
Subject: [PATCH 088/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 6c2e39313d..9c57f76bba 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -32,12 +32,12 @@ function Get-ModifiedFiles {
         [string] $CompareCommit = 'HEAD^'
     )
 
-    Write-Verbose "Gathering modified files between [$Commit] and [$CompareCommit]"
+    Write-Verbose "Gathering modified files between [$Commit] and [$CompareCommit]" -Verbose
     $Diff = git diff --name-only --diff-filter=AM $Commit $CompareCommit
     $ModifiedFiles = $Diff | Get-Item
-    Write-Verbose 'The following files have been modified:'
+    Write-Verbose 'The following files have been modified:' -Verbose
     $ModifiedFiles | ForEach-Object {
-        Write-Verbose (' - [{0}]' -f $_.FullName)
+        Write-Verbose (' - [{0}]' -f $_.FullName) -Verbose
     }
 
     return $ModifiedFiles

From 7ac7d63e898b118f618483b877c0edc5adf3b143 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:50:06 +0100
Subject: [PATCH 089/121] Update
 utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 .../resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index 725dc094ae..6b3c85f493 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -28,7 +28,7 @@ Example: 'West Europe'
 .EXAMPLE
 Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
 
-Try to publish the KeyVault module with version 3.0.0-alpha to a private bicep registry called KeyVault based on a value provided in the UI
+Try to publish the KeyVault module with version '3.0.0-alpha' to a private bicep registry called 'adpsxxazacrx001' based on a value provided in the UI
 #>
 function Publish-ModuleToPrivateBicepRegistry {
 

From 7d17eb4f841c2cc67acc459b29949c49dc9b4a13 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:50:25 +0100
Subject: [PATCH 090/121] Update
 utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 .../resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index f00a84bc66..1255874c2a 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -13,7 +13,7 @@ Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
 Required. Version of the module to publish, following SemVer convention.
 Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
 
-.PARAMETER vstsOrganizationUri
+.PARAMETER VstsOrganizationUri
 Mandatory. Azure DevOps organization URL hosting the artifacts feed.
 Example: 'https://dev.azure.com/fabrikam/'.
 

From bfa8fa777b0aeeabbe39fe18328b711e48bda812 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:51:31 +0100
Subject: [PATCH 091/121] Update docs/wiki/PipelinesDesign.md

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 docs/wiki/PipelinesDesign.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index 31819a6f5f..cc95d39e28 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -125,7 +125,7 @@ The publishing works as follows:
 
 1. The script `utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1` gets all changed module files including child modules and handles the logic of propagating the appropriate module version to be used:
    1. The major (`x.0`) and minor (`0.x`) version are set based on the file `version.json` in the module folder.
-   1. The patch (`0.0.x`) version is calculated based on the number of commits on the `HEAD` ref. This Will cause the patch version to never reset to 0 with major and/or minor increment, as specified for [semver](https://semver.org/).
+   1. The patch (`0.0.x`) version is calculated based on the number of commits on the `HEAD` ref. This will cause the patch version to never reset to 0 with major and/or minor increment, as specified for [semver](https://semver.org/).
 
 ## Shared concepts
 

From f92a291db00234b2e5958c72c3ee075ad2fe0365 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:51:43 +0100
Subject: [PATCH 092/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 9c57f76bba..b701a42e69 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -5,7 +5,7 @@
 Get modified files between two commits.
 
 .PARAMETER Commit
-A git reference to base the comparison on.
+Optional. A git reference to base the comparison on.
 
 .PARAMETER CompareCommit
 A git reference to compare with.

From 15c27237456d15058486af456e809333e5dd4c67 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:51:56 +0100
Subject: [PATCH 093/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index b701a42e69..189b5dae6c 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -51,7 +51,7 @@ Find the closest deploy.bicep/json file to the current directory/file.
 This function will search the current directory and all parent directories for a deploy.bicep/json file.
 
 .PARAMETER Path
-Path to the folder/file that should be searched
+Required. Path to the folder/file that should be searched
 
 .EXAMPLE
 Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_cuaId.bicep"

From 8de6044a6b594029b2f2f0b288b7d7f82181aeab Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:52:08 +0100
Subject: [PATCH 094/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 189b5dae6c..5801a33d34 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -149,7 +149,7 @@ Gets the parent deploy.bicep/json file(s) to the changed files in the module fol
 Path to a deploy.bicep/json file.
 
 .PARAMETER Recurse
-If true, the function will recurse up the folder structure to find the closest deploy.bicep/json file.
+Optional. If true, the function will recurse up the folder structure to find the closest deploy.bicep/json file.
 
 .EXAMPLE
 Get-ParentModuleTemplateFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep' -Recurse

From 43983dfda6d4f04216f523d2283d4b0d0a3a1b84 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:52:33 +0100
Subject: [PATCH 095/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 5801a33d34..6046ecffd2 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -210,7 +210,7 @@ function Get-ParentModuleTemplateFile {
 Get the number of commits following the specified commit.
 
 .PARAMETER Commit
-A specified git reference to get commit counts on.
+Optional. A specified git reference to get commit counts on.
 
 .EXAMPLE
 Get-GitDistance -Commit origin/main.

From df152236bf2dc48ae9c3dfb5e57cae1b21406678 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:52:43 +0100
Subject: [PATCH 096/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 6046ecffd2..25e756770f 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -279,7 +279,7 @@ Major and minor version numbers are gathered from the version.json file.
 Patch version number is calculated based on the git commit count on the branch.
 
 .PARAMETER TemplateFilePath
-Path to a deploy.bicep/json file.
+Required. Path to a deploy.bicep/json file.
 
 .EXAMPLE
 Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'

From db1c5fb0214375a38561d6242f1ead4ff43ade13 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:52:56 +0100
Subject: [PATCH 097/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 25e756770f..3a128c9435 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -324,7 +324,7 @@ Generates a hashtable with template file paths to update with a new version.
 Generates a hashtable with template file paths to update with a new version.
 
 .PARAMETER TemplateFilePath
-Path to a deploy.bicep/json file.
+Required. Path to a deploy.bicep/json file.
 
 .EXAMPLE
 Get-ModulesToUpdate -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'

From fdd4797ec12ec0e2c225608ace3f41fd61dbfb91 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:54:13 +0100
Subject: [PATCH 098/121] Update
 utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 .../resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index 1255874c2a..cb7ce8ab86 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -1,9 +1,9 @@
 <#
 .SYNOPSIS
-Publish a new version of a given module to a DevOps artifact feed
+Publish a new version of a given module to an Azure DevOps artifact feed
 
 .DESCRIPTION
-Publish a new version of a given module to a DevOps artifact feed
+Publish a new version of a given module to an Azure DevOps artifact feed
 
 .PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.

From e4be3da7a083170479cfd82f42cb1170fd92e13e Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 11:57:36 +0100
Subject: [PATCH 099/121] Remove empty line on analysis services

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index e77e2b14af..c35bd16513 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,7 +19,6 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
-
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 

From 63e7ad466d70eaac4b0714a5ad13d8f5dead65c7 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 12:02:36 +0100
Subject: [PATCH 100/121] Update Get-ModifiedFiles to singular

---
 .../pipelines/resourcePublish/Get-ModulesToUpdate.ps1     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 3a128c9435..642bfd46c3 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -11,7 +11,7 @@ Optional. A git reference to base the comparison on.
 A git reference to compare with.
 
 .EXAMPLE
-Get-ModifiedFiles -Commit "HEAD^" -CompareCommit "HEAD"
+Get-ModifiedFile -Commit "HEAD^" -CompareCommit "HEAD"
 
     Directory: C:\Repo\Azure\ResourceModules\utilities\pipelines\resourcePublish
 
@@ -21,8 +21,7 @@ la---          08.12.2021    15:50           7133 Script.ps1
 
 Get modified files between previous and current commit.
 #>
-function Get-ModifiedFiles {
-    # BUG: When developing, the current logic will require you to modify the deploy.bicep/json file for it to register the change.
+function Get-ModifiedFile {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
@@ -118,7 +117,7 @@ function Get-TemplateFileToUpdate {
         [string] $ModuleFolderPath
     )
 
-    $ModifiedFiles = Get-ModifiedFiles -Verbose
+    $ModifiedFiles = Get-ModifiedFile -Verbose
     Write-Verbose "Looking for modified files under: [$ModuleFolderPath]"
     $ModifiedModuleFiles = $ModifiedFiles | Where-Object { $_.FullName -like "*$ModuleFolderPath*" }
 
@@ -330,6 +329,7 @@ Required. Path to a deploy.bicep/json file.
 Get-ModulesToUpdate -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
 
 
+#TODO: Generates a hashtable with template file paths to update with a new version.
 #>#
 function Get-ModulesToUpdate {
 

From 9928d886caa09ca69e0f8e4780bbbc70a4c8cd57 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 12:03:02 +0100
Subject: [PATCH 101/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 642bfd46c3..d0779dd4c9 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -239,7 +239,7 @@ Gets the version file from the corresponding deploy.bicep/json file.
 The file needs to be in the same folder as the template file itself.
 
 .PARAMETER TemplateFilePath
-Path to a deploy.bicep/json file.
+Required. Path to a deploy.bicep/json file.
 
 .EXAMPLE
 Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'

From 4e503c42445efd0d4a7eb477d041be829375c288 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 12:03:09 +0100
Subject: [PATCH 102/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index d0779dd4c9..5d25e1feee 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -145,7 +145,7 @@ Gets the parent deploy.bicep/json file(s) to the changed files in the module fol
 Gets the parent deploy.bicep/json file(s) to the changed files in the module folder structure.
 
 .PARAMETER TemplateFilePath
-Path to a deploy.bicep/json file.
+Required. Path to a deploy.bicep/json file.
 
 .PARAMETER Recurse
 Optional. If true, the function will recurse up the folder structure to find the closest deploy.bicep/json file.

From 3c6d71ff273749881669461e45199d2bff37f41c Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 12:03:16 +0100
Subject: [PATCH 103/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 5d25e1feee..581f1692b7 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -97,7 +97,7 @@ Find the closest deploy.bicep/json file to the changed files in the module folde
 Find the closest deploy.bicep/json file to the changed files in the module folder structure.
 
 .PARAMETER ModuleFolderPath
-Path to the main/parent module folder.
+Required. Path to the main/parent module folder.
 
 .EXAMPLE
 Get-TemplateFileToUpdate -ModuleFolderPath "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\"

From 3743b3e6198f054acb716bde94b1edb77e38e700 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 12:03:22 +0100
Subject: [PATCH 104/121] Update
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1

Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com>
---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 581f1692b7..418cbc2e4e 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -8,7 +8,7 @@ Get modified files between two commits.
 Optional. A git reference to base the comparison on.
 
 .PARAMETER CompareCommit
-A git reference to compare with.
+Optional. A git reference to compare with.
 
 .EXAMPLE
 Get-ModifiedFile -Commit "HEAD^" -CompareCommit "HEAD"

From e8004f94f9d3d7a089bba95ec3b840092b3ffcc4 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 12:08:05 +0100
Subject: [PATCH 105/121] Update based on alex comment on change to
 ModifiedFiles -> ModifiedFileList.

---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 642bfd46c3..b7913074e7 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -11,7 +11,7 @@ Optional. A git reference to base the comparison on.
 A git reference to compare with.
 
 .EXAMPLE
-Get-ModifiedFile -Commit "HEAD^" -CompareCommit "HEAD"
+Get-ModifiedFileList -Commit "HEAD^" -CompareCommit "HEAD"
 
     Directory: C:\Repo\Azure\ResourceModules\utilities\pipelines\resourcePublish
 
@@ -21,7 +21,7 @@ la---          08.12.2021    15:50           7133 Script.ps1
 
 Get modified files between previous and current commit.
 #>
-function Get-ModifiedFile {
+function Get-ModifiedFileList {
     [CmdletBinding()]
     param (
         [Parameter(Mandatory = $false)]
@@ -117,7 +117,7 @@ function Get-TemplateFileToUpdate {
         [string] $ModuleFolderPath
     )
 
-    $ModifiedFiles = Get-ModifiedFile -Verbose
+    $ModifiedFiles = Get-ModifiedFileList -Verbose
     Write-Verbose "Looking for modified files under: [$ModuleFolderPath]"
     $ModifiedModuleFiles = $ModifiedFiles | Where-Object { $_.FullName -like "*$ModuleFolderPath*" }
 

From 69a1a9e1520adc7d2e81d51693e7ed1db9ab0023 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 12:39:54 +0100
Subject: [PATCH 106/121] Improve gathering branch name + clean up prerelease
 section

---
 .../resourcePublish/Get-ModulesToUpdate.ps1   | 53 ++++++++++++++++---
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index bb69a51a95..9fa171a434 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -42,6 +42,48 @@ function Get-ModifiedFileList {
     return $ModifiedFiles
 }
 
+<#
+.SYNOPSIS
+Get the name of the current checked out branch.
+
+.DESCRIPTION
+Get the name of the current checked out branch. If git cannot find it, best effort based on environment variables is used.
+
+.EXAMPLE
+Get-CurrentBranch
+
+feature-branch-1
+
+Get the name of the current checked out branch.
+
+#>
+function Get-GitBranchName {
+    [CmdletBinding()]
+    param ()
+
+    # Get branch name from Git
+    try {
+        Write-Verbose "Git: Using git command 'git branch --show-current'" -Verbose
+        $BranchName = git branch --show-current
+    } catch {
+        Write-Verbose 'Git: No name found.' -Verbose
+    }
+
+    # If git could not get name, try GitHub variable
+    if ([string]::IsNullOrEmpty($BranchName) -and (Test-Path env:GITHUB_REF_NAME)) {
+        Write-Verbose "GitHub: Using environment variable 'GITHUB_REF_NAME': [$env:GITHUB_REF_NAME]" -Verbose
+        $BranchName = $env:GITHUB_REF_NAME
+    }
+
+    # If git could not get name, try Azure DevOps variable
+    if ([string]::IsNullOrEmpty($BranchName) -and (Test-Path env:BUILD_SOURCEBRANCHNAME)) {
+        Write-Verbose "Azure DevOps: Using environment variable 'BUILD_SOURCEBRANCHNAME': [$env:BUILD_SOURCEBRANCHNAME]" -Verbose
+        $BranchName = $env:BUILD_SOURCEBRANCHNAME
+    }
+
+    return $BranchName
+}
+
 <#
 .SYNOPSIS
 Find the closest deploy.bicep/json file to the current directory/file.
@@ -299,14 +341,13 @@ function Get-NewModuleVersion {
     $Patch = Get-GitDistance
     $NewVersion = "$Version.$Patch"
 
-    $CurrentBranch = git symbolic-ref --short 'HEAD'
-    #$CurrentBranch = git branch --show-current
-    Write-Verbose "Current branch: [$CurrentBranch]" -Verbose
-    if (($CurrentBranch -ne 'main') -or ($CurrentBranch -ne 'master') ) {
-        $PreRelease = $CurrentBranch -replace '[^a-zA-Z0-9\.\-_]'
+    $BranchName = Get-GitBranchName -Verbose
+
+    Write-Verbose "Current branch: [$BranchName]" -Verbose
+    if (($BranchName -ne 'main') -or ($BranchName -ne 'master') ) {
+        $PreRelease = $BranchName -replace '[^a-zA-Z0-9\.\-_]'
         Write-Verbose "PreRelease: [$PreRelease]" -Verbose
         $NewVersion = "$NewVersion-prerelease".ToLower()
-        #$NewVersion = "$NewVersion-prerelease-$PreRelease"
         Write-Verbose "New version: [$NewVersion]" -Verbose
     }
 

From 4bc2898732228a9bd2e5b8ecdfdc30a09b224474 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 12:40:38 +0100
Subject: [PATCH 107/121] Move verbose so it runs even if its merge to main

---
 utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 9fa171a434..58a40d3d98 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -348,8 +348,9 @@ function Get-NewModuleVersion {
         $PreRelease = $BranchName -replace '[^a-zA-Z0-9\.\-_]'
         Write-Verbose "PreRelease: [$PreRelease]" -Verbose
         $NewVersion = "$NewVersion-prerelease".ToLower()
-        Write-Verbose "New version: [$NewVersion]" -Verbose
     }
+    
+    Write-Verbose "New version: [$NewVersion]" -Verbose
 
     return $NewVersion
 }

From 2da9a05172f58f69bb8e04fd009c09bb8c3b1c94 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 12:43:16 +0100
Subject: [PATCH 108/121] Force enable verbose

---
 .../resourcePublish/Get-ModulesToUpdate.ps1   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 58a40d3d98..d9a334d0e1 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -160,7 +160,7 @@ function Get-TemplateFileToUpdate {
     )
 
     $ModifiedFiles = Get-ModifiedFileList -Verbose
-    Write-Verbose "Looking for modified files under: [$ModuleFolderPath]"
+    Write-Verbose "Looking for modified files under: [$ModuleFolderPath]" -Verbose
     $ModifiedModuleFiles = $ModifiedFiles | Where-Object { $_.FullName -like "*$ModuleFolderPath*" }
 
     $TemplateFilesToUpdate = $ModifiedModuleFiles | ForEach-Object {
@@ -168,12 +168,12 @@ function Get-TemplateFileToUpdate {
     } | Sort-Object -Property FullName -Unique -Descending
 
     if ($TemplateFilesToUpdate.Count -eq 0) {
-        Write-Verbose 'No template file found in the modified module.'
+        Write-Verbose 'No template file found in the modified module.' -Verbose
     }
 
-    Write-Verbose ('Modified modules found: [{0}]' -f $TemplateFilesToUpdate.count)
+    Write-Verbose ('Modified modules found: [{0}]' -f $TemplateFilesToUpdate.count) -Verbose
     $TemplateFilesToUpdate | ForEach-Object {
-        Write-Verbose " - $($_.FullName)"
+        Write-Verbose " - $($_.FullName)" -Verbose
     }
 
     return $TemplateFilesToUpdate
@@ -231,11 +231,11 @@ function Get-ParentModuleTemplateFile {
     }
 
     if (-not (Test-Path -Path $ParentTemplateFilePath)) {
-        Write-Verbose "No parent template file found at: [$ParentTemplateFilePath]"
+        Write-Verbose "No parent template file found at: [$ParentTemplateFilePath]" -Verbose
         return
     }
 
-    Write-Verbose "Parent template file found at: [$ParentTemplateFilePath]"
+    Write-Verbose "Parent template file found at: [$ParentTemplateFilePath]" -Verbose
     $ParentTemplateFilesToUpdate = [System.Collections.ArrayList]@()
     $ParentTemplateFilesToUpdate += $ParentTemplateFilePath | Get-Item
 
@@ -349,7 +349,7 @@ function Get-NewModuleVersion {
         Write-Verbose "PreRelease: [$PreRelease]" -Verbose
         $NewVersion = "$NewVersion-prerelease".ToLower()
     }
-    
+
     Write-Verbose "New version: [$NewVersion]" -Verbose
 
     return $NewVersion
@@ -393,7 +393,7 @@ function Get-ModulesToUpdate {
         }
 
         $ParentTemplateFilesToUpdate = Get-ParentModuleTemplateFile -TemplateFilePath $TemplateFileToUpdate.FullName -Recurse
-        Write-Verbose "Found [$($ParentTemplateFilesToUpdate.count)] parent template files to update"
+        Write-Verbose "Found [$($ParentTemplateFilesToUpdate.count)] parent template files to update" -Verbose
         foreach ($ParentTemplateFileToUpdate in $ParentTemplateFilesToUpdate) {
             $ParentModuleVersion = Get-NewModuleVersion -TemplateFilePath $ParentTemplateFileToUpdate.FullName
 
@@ -406,9 +406,9 @@ function Get-ModulesToUpdate {
 
     $ModulesToUpdate = $ModulesToUpdate | Sort-Object TemplateFilePath -Descending -Unique
 
-    Write-Verbose 'Update the following modules:'
+    Write-Verbose 'Update the following modules:'-Verbose
     $ModulesToUpdate | ForEach-Object {
-        Write-Verbose (' - [{0}] [{1}] ' -f $_.Version, $_.TemplateFilePath)
+        Write-Verbose (' - [{0}] [{1}] ' -f $_.Version, $_.TemplateFilePath) -Verbose
     }
 
     return $ModulesToUpdate

From 8fa7086255b3fa88b768f5af5bfa2681599d49ae Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 13:02:30 +0100
Subject: [PATCH 109/121] Fix comments

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep          | 2 +-
 arm/Microsoft.Network/virtualNetworks/deploy.bicep           | 2 +-
 .../Publish-ModuleToUniversalArtifactFeed.ps1                | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index c35bd16513..a49d21a2f0 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -40,8 +40,8 @@ param diagnosticEventHubAuthorizationRuleId string = ''
 param diagnosticEventHubName string = ''
 
 @allowed([
-  'NotSpecified'
   'CanNotDelete'
+  'NotSpecified'
   'ReadOnly'
 ])
 @description('Optional. Specify the type of lock.')
diff --git a/arm/Microsoft.Network/virtualNetworks/deploy.bicep b/arm/Microsoft.Network/virtualNetworks/deploy.bicep
index aebc8e004b..6b41b2b203 100644
--- a/arm/Microsoft.Network/virtualNetworks/deploy.bicep
+++ b/arm/Microsoft.Network/virtualNetworks/deploy.bicep
@@ -37,8 +37,8 @@ param diagnosticEventHubAuthorizationRuleId string = ''
 param diagnosticEventHubName string = ''
 
 @allowed([
-  'NotSpecified'
   'CanNotDelete'
+  'NotSpecified'
   'ReadOnly'
 ])
 @description('Optional. Specify the type of lock.')
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index cb7ce8ab86..ba80b349ec 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -98,14 +98,11 @@ function Publish-ModuleToUniversalArtifactFeed {
                 '--description', "$universalPackageModuleName Module",
                 '--verbose'
             )
+
             if (-not [string]::IsNullOrEmpty($VstsFeedProject)) {
                 $inputObject += @('--project', "$VstsFeedProject")
             }
 
-            Write-Verbose 'The command to publish to the feed is:' -Verbose
-            $command = "az artifacts universal publish $($inputObject -join ' ')"
-            Write-Verbose $command -Verbose
-
             az artifacts universal publish @inputObject
 
         }

From c865653fc4691e945b7b00173b42ee8da24cbd86 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 13:04:58 +0100
Subject: [PATCH 110/121] Fix firewall policies pipline

---
 .azuredevops/modulePipelines/ms.network.firewallpolicies.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
index 6eb99b2212..febae276d5 100644
--- a/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
+++ b/.azuredevops/modulePipelines/ms.network.firewallpolicies.yml
@@ -46,6 +46,6 @@ stages:
 
   - stage: Publishing
     displayName: Publish module
-    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master')))
+    condition: and(succeeded(), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/master'), eq('${{ parameters.prerelease }}', 'true')))
     jobs:
       - template: /.azuredevops/pipelineTemplates/module.jobs.publish.yml'

From 72800caef68e6bf470c23d0b81c9b24d60775fc0 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 13:24:29 +0100
Subject: [PATCH 111/121] Align 'Mandatory' param documentation and declaration

---
 .../scripts/Get-WorkflowDefaultInput.ps1             |  4 ++--
 .../resourcePublish/Get-ModulesToUpdate.ps1          | 12 ++++++------
 .../Publish-ModuleToPrivateBicepRegistry.ps1         |  4 ++--
 .../resourcePublish/Publish-ModuleToTemplateSpec.ps1 |  2 +-
 .../Publish-ModuleToUniversalArtifactFeed.ps1        |  8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1 b/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1
index fde4d6bdb6..6db706dcd3 100644
--- a/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1
+++ b/.github/actions/templates/getWorkflowInput/scripts/Get-WorkflowDefaultInput.ps1
@@ -42,7 +42,7 @@ function Get-WorkflowDefaultInput {
         function Get-LineIndentation {
             [CmdletBinding()]
             param (
-                [Parameter()]
+                [Parameter(Mandatory = $false)]
                 [string] $Line
             )
             begin {}
@@ -88,7 +88,7 @@ function Get-WorkflowDefaultInput {
             param (
                 [Parameter(Mandatory)]
                 [string] $InputName,
-                
+
                 [Parameter(Mandatory)]
                 [string[]] $Content
             )
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index d9a334d0e1..9af90e89f3 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -92,7 +92,7 @@ Find the closest deploy.bicep/json file to the current directory/file.
 This function will search the current directory and all parent directories for a deploy.bicep/json file.
 
 .PARAMETER Path
-Required. Path to the folder/file that should be searched
+Mandatory. Path to the folder/file that should be searched
 
 .EXAMPLE
 Find-TemplateFile -Path "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\.bicep\nested_cuaId.bicep"
@@ -139,7 +139,7 @@ Find the closest deploy.bicep/json file to the changed files in the module folde
 Find the closest deploy.bicep/json file to the changed files in the module folder structure.
 
 .PARAMETER ModuleFolderPath
-Required. Path to the main/parent module folder.
+Mandatory. Path to the main/parent module folder.
 
 .EXAMPLE
 Get-TemplateFileToUpdate -ModuleFolderPath "C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\"
@@ -187,7 +187,7 @@ Gets the parent deploy.bicep/json file(s) to the changed files in the module fol
 Gets the parent deploy.bicep/json file(s) to the changed files in the module folder structure.
 
 .PARAMETER TemplateFilePath
-Required. Path to a deploy.bicep/json file.
+Mandatory. Path to a deploy.bicep/json file.
 
 .PARAMETER Recurse
 Optional. If true, the function will recurse up the folder structure to find the closest deploy.bicep/json file.
@@ -281,7 +281,7 @@ Gets the version file from the corresponding deploy.bicep/json file.
 The file needs to be in the same folder as the template file itself.
 
 .PARAMETER TemplateFilePath
-Required. Path to a deploy.bicep/json file.
+Mandatory. Path to a deploy.bicep/json file.
 
 .EXAMPLE
 Get-ModuleVersionFromFile -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
@@ -320,7 +320,7 @@ Major and minor version numbers are gathered from the version.json file.
 Patch version number is calculated based on the git commit count on the branch.
 
 .PARAMETER TemplateFilePath
-Required. Path to a deploy.bicep/json file.
+Mandatory. Path to a deploy.bicep/json file.
 
 .EXAMPLE
 Get-NewModuleVersion -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
@@ -365,7 +365,7 @@ Generates a hashtable with template file paths to update with a new version.
 Generates a hashtable with template file paths to update with a new version.
 
 .PARAMETER TemplateFilePath
-Required. Path to a deploy.bicep/json file.
+Mandatory. Path to a deploy.bicep/json file.
 
 .EXAMPLE
 Get-ModulesToUpdate -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index 6b3c85f493..cbffcf51c9 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -10,7 +10,7 @@ Mandatory. Path to the module deployment file from root.
 Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
 
 .PARAMETER ModuleVersion
-Required. Version of the module to publish, following SemVer convention.
+Mandatory. Version of the module to publish, following SemVer convention.
 Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
 
 .PARAMETER BicepRegistryName
@@ -28,7 +28,7 @@ Example: 'West Europe'
 .EXAMPLE
 Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
 
-Try to publish the KeyVault module with version '3.0.0-alpha' to a private bicep registry called 'adpsxxazacrx001' based on a value provided in the UI
+Try to publish the KeyVault module with version .0.0-alpha o a private bicep registry called KeKeyVVult value provided in the UI
 #>
 function Publish-ModuleToPrivateBicepRegistry {
 
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
index 9f50f58a34..6a2d1c00df 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
@@ -11,7 +11,7 @@ Mandatory. Path to the module deployment file from root.
 Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
 
 .PARAMETER ModuleVersion
-Required. Version of the module to publish, following SemVer convention.
+Mandatory. Version of the module to publish, following SemVer convention.
 Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
 
 .PARAMETER TemplateSpecsRgName
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index ba80b349ec..33c8176731 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -1,19 +1,19 @@
 <#
 .SYNOPSIS
-Publish a new version of a given module to an Azure DevOps artifact feed
+Publish a new version of a given module to a artifact feed
 
 .DESCRIPTION
-Publish a new version of a given module to an Azure DevOps artifact feed
+Publish a new version of a given module to aDartifact feed
 
 .PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
 Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
 
 .PARAMETER ModuleVersion
-Required. Version of the module to publish, following SemVer convention.
+Mandatory. Version of the module to publish, following SemVer convention.
 Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
 
-.PARAMETER VstsOrganizationUri
+.PARAMETER vstsOrganizationUri
 Mandatory. Azure DevOps organization URL hosting the artifacts feed.
 Example: 'https://dev.azure.com/fabrikam/'.
 

From b388771d48c46c017adbfeb016948ba0322b6d13 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 13:34:11 +0100
Subject: [PATCH 112/121] Reverted whole ToC of PipelinesDesign

---
 docs/wiki/PipelinesDesign.md | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index cc95d39e28..0b6d3f78cb 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -6,14 +6,10 @@ This section gives you an overview of the design principals the pipelines follow
 
 ### _Navigation_
 
-- [Pipelines Design](#pipelines-design)
-    - [_Navigation_](#navigation)
 - [Module Pipelines](#module-pipelines)
   - [Module pipeline inputs](#module-pipeline-inputs)
   - [Pipeline phases](#pipeline-phases)
     - [Validate](#validate)
-      - [Static module validation](#static-module-validation)
-      - [Simulated deployment validation](#simulated-deployment-validation)
     - [Test deploy](#test-deploy)
       - [Removal](#removal)
     - [Publish](#publish)
@@ -21,28 +17,23 @@ This section gives you an overview of the design principals the pipelines follow
     - [Prerequisites](#prerequisites)
     - [Pipeline secrets](#pipeline-secrets)
     - [Pipeline variables](#pipeline-variables)
-      - [**_General_**](#general)
-      - [**_Template-specs specific (publishing)_**](#template-specs-specific-publishing)
-      - [**_Private bicep registry specific (publishing)_**](#private-bicep-registry-specific-publishing)
     - [Tokens Replacement](#tokens-replacement)
 - [Platform pipelines](#platform-pipelines)
   - [Dependencies pipeline](#dependencies-pipeline)
-    - [Dependencies pipeline inputs](#dependencies-pipeline-inputs)
   - [ReadMe pipeline](#readme-pipeline)
   - [Wiki pipeline](#wiki-pipeline)
 - [DevOps-Tool-specific considerations](#devops-tool-specific-considerations)
   - [GitHub Workflows](#github-workflows)
-    - [**GitHub Component:** GitHub secrets](#github-component-github-secrets)
-    - [**GitHub Component:** Variable file](#github-component-variable-file)
-    - [**GitHub Component:** Composite Actions\*\*](#github-component-composite-actions)
-    - [**GitHub Component:** Workflows](#github-component-workflows)
+    - [Component: GitHub secret](#github-component-github-secrets)
+    - [Component: Variable file](#github-component-variable-file)
+    - [Component: Composite actions](#github-component-composite-actions)
+    - [Component: Workflows](#github-component-workflows)
   - [Azure DevOps Pipelines](#azure-devops-pipelines)
-    - [**Azure DevOps Component:** Service Connection](#azure-devops-component-service-connection)
-    - [**Azure DevOps Component:** Variable group](#azure-devops-component-variable-group)
-    - [**Azure DevOps Component:** Variable file](#azure-devops-component-variable-file)
-    - [**Azure DevOps Component:** Pipeline templates](#azure-devops-component-pipeline-templates)
-    - [**Azure DevOps Component:** Pipelines](#azure-devops-component-pipelines)
-      - [Azure DevOps Artifacts](#azure-devops-artifacts)
+    - [Component: Service connection](#azure-devops-component-service-connection)
+    - [Component: Variable group](#azure-devops-component-variable-group)
+    - [Component: Variable file](#azure-devops-component-variable-file)
+    - [Component: Pipeline templates](#azure-devops-component-pipeline-templates)
+    - [Component: Pipelines](#azure-devops-component-pipelines)
 
 ---
 

From 3e47ee6f1894cfff93bac8f2028a689857b6055b Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 13:51:17 +0100
Subject: [PATCH 113/121] revert some wiki stuff + fix

---
 docs/wiki/PipelinesDesign.md | 113 +++++++++++++++++------------------
 1 file changed, 56 insertions(+), 57 deletions(-)

diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index 0b6d3f78cb..6c667f1606 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -138,12 +138,12 @@ For both the [simulated deployment validation](#simulated-deployment-validation)
 
 To use the platform pipelines you need several secrets set up in your DevOps platform. Contrary to the pipeline variables we describe in the [subsequent section](#pipeline-variables) these following variables are considered sensitive.
 
-| Secret Name           | Example                                | Description                                                                                                                                                                          |
-| --------------------- | -------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `ARM_MGMTGROUP_ID`    | `de33a0e7-64d9-4a94-8fe9-b018cedf1e05` | The group ID of the management group to test deploy modules of that level in.                                                                                                        |
-| `ARM_SUBSCRIPTION_ID` | `d0312b25-9160-4550-914f-8738d9b5caf5` | The subscription ID of the subscription to test deploy modules of that level in.                                                                                                     |
-| `ARM_TENANT_ID`       | `9734cec9-4384-445b-bbb6-767e7be6e5ec` | The tenant ID of the tenant to test deploy modules of that level in.                                                                                                                 |
-| `DEPLOYMENT_SP_ID`    | `de33a0e7-64d9-4a94-8fe9-b018cedf1e05` | This is the Principal (Object ID) for the Service Principal used as the Azure service connection. It is used for Default Role Assignments when Modules are being deployed into Azure |
+| Secret Name | Example | Description |
+| - | - | - |
+| `ARM_MGMTGROUP_ID` | `de33a0e7-64d9-4a94-8fe9-b018cedf1e05` | The group ID of the management group to test deploy modules of that level in. |
+| `ARM_SUBSCRIPTION_ID` | `d0312b25-9160-4550-914f-8738d9b5caf5` | The subscription ID of the subscription to test deploy modules of that level in. |
+| `ARM_TENANT_ID` | `9734cec9-4384-445b-bbb6-767e7be6e5ec` | The tenant ID of the tenant to test deploy modules of that level in. |
+| `DEPLOYMENT_SP_ID` | `de33a0e7-64d9-4a94-8fe9-b018cedf1e05` | This is the Principal (Object ID) for the Service Principal used as the Azure service connection. It is used for Default Role Assignments when Modules are being deployed into Azure |
 
 The location where to set these secrets up depends on the DevOps platform you use. Also, there may be additional platform-specific secrets to set up. For further information please refer to [this section](#devops-tool-specific-considerations).
 
@@ -153,28 +153,28 @@ The primary pipeline variable file hosts the fundamental pipeline configuration
 
 #### **_General_**
 
-| Variable Name       | Example Value   | Description                                                                                                                     |
-| ------------------- | --------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| `defaultLocation`   | "WestEurope"    | The default location to deploy resources to. If no location is specified in the deploying parameter file, this location is used |
-| `resourceGroupName` | "validation-rg" | The resource group to deploy all resources for validation to                                                                    |
+| Variable Name | Example Value | Description |
+| - | - | - |
+| `defaultLocation` | "WestEurope" | The default location to deploy resources to. If no location is specified in the deploying parameter file, this location is used |
+| `resourceGroupName` | "validation-rg" | The resource group to deploy all resources for validation to |
 
 #### **_Template-specs specific (publishing)_**
 
-| Variable Name              | Example Value                                                       | Description                                                                                                               |
-| -------------------------- | ------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
-| `templateSpecsRGName`      | "artifacts-rg"                                                      | The resource group to host the created template-specs                                                                     |
-| `templateSpecsRGLocation`  | "WestEurope"                                                        | The location of the resource group to host the template-specs. Is used to create a new resource group if not yet existing |
-| `templateSpecsDescription` | "This is a module from the [Common Azure Resource Modules Library]" | A description to add to the published template specs                                                                      |
-| `templateSpecsDoPublish`   | "true"                                                              | A central switch to enable/disable publishing to template-specs                                                           |
+| Variable Name | Example Value | Description |
+| - | - | - |
+| `templateSpecsRGName` | "artifacts-rg" | The resource group to host the created template-specs |
+| `templateSpecsRGLocation` | "WestEurope" | The location of the resource group to host the template-specs. Is used to create a new resource group if not yet existing |
+| `templateSpecsDescription` | "This is a module from the [Common Azure Resource Modules Library]" | A description to add to the published template specs |
+| `templateSpecsDoPublish` | "true" | A central switch to enable/disable publishing to template-specs |
 
 #### **_Private bicep registry specific (publishing)_**
 
-| Variable Name            | Example Value     | Description                                                                                                                                            |
-| ------------------------ | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `bicepRegistryName`      | "adpsxxazacrx001" | The container registry to publish bicep templates to                                                                                                   |
-| `bicepRegistryRGName`    | "artifacts-rg"    | The resource group of the container registry to publish bicep templates to. Is used to create a new container registry if not yet existing             |
-| `bicepRegistryRGName`    | "artifacts-rg"    | The location of the resource group of the container registry to publish bicep templates to. Is used to create a new resource group if not yet existing |
-| `bicepRegistryDoPublish` | "true"            | A central switch to enable/disable publishing to the private bicep registry                                                                            |
+| Variable Name | Example Value | Description |
+| - | - | - |
+| `bicepRegistryName` | "adpsxxazacrx001" | The container registry to publish bicep templates to |
+| `bicepRegistryRGName` | "artifacts-rg" | The resource group of the container registry to publish bicep templates to. Is used to create a new container registry if not yet existing |
+| `bicepRegistryRGName` | "artifacts-rg" | The location of the resource group of the container registry to publish bicep templates to. Is used to create a new resource group if not yet existing |
+| `bicepRegistryDoPublish` | "true" | A central switch to enable/disable publishing to the private bicep registry |
 
 ### Tokens Replacement
 
@@ -245,25 +245,25 @@ The GitHub repository secrets can be set up in the repositories _'Settings'_ as
 
 For _GitHub_ in particular we need the following secrets in addition to those described in the shared [pipeline secrets](#pipeline-secrets) section:
 
-| Secret Name                | Example                                                                                                                                                                                                | Description                                                                                                                                                                                                                                           |
-| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `AZURE_CREDENTIALS`        | `{"clientId": "4ce8ce4c-cac0-48eb-b815-65e5763e2929", "clientSecret": "<placeholder>", "subscriptionId": "d0312b25-9160-4550-914f-8738d9b5caf5", "tenantId": "9734cec9-4384-445b-bbb6-767e7be6e5ec" }` | The login credentials of the [deployment principal](./GettingStarted#platform-principal) to use to log into the target Azure environment to test in. The format is described [here](https://github.com/Azure/login#configure-deployment-credentials). |
-| `PLATFORM_REPO_UPDATE_PAT` | `<placeholder>`                                                                                                                                                                                        | A PAT with enough permissions assigned to it to push into the main branch. This PAT is leveraged by pipelines that automatically generate ReadMe files to keep them up to date                                                                        |
+| Secret Name | Example | Description |
+| - | - | - |
+| `AZURE_CREDENTIALS` | `{"clientId": "4ce8ce4c-cac0-48eb-b815-65e5763e2929", "clientSecret": "<placeholder>", "subscriptionId": "d0312b25-9160-4550-914f-8738d9b5caf5", "tenantId": "9734cec9-4384-445b-bbb6-767e7be6e5ec" }` | The login credentials of the [deployment principal](./GettingStarted#platform-principal) to use to log into the target Azure environment to test in. The format is described [here](https://github.com/Azure/login#configure-deployment-credentials). |
+| `PLATFORM_REPO_UPDATE_PAT` | `<placeholder>` | A PAT with enough permissions assigned to it to push into the main branch. This PAT is leveraged by pipelines that automatically generate ReadMe files to keep them up to date |
 
 ### **GitHub Component:** Variable file
 
 The [pipeline configuration file](#pipeline-variables) can be found at `.github/variables/global.variables.json`.
 
-### **GitHub Component:** Composite Actions\*\*
+### **GitHub Component:** Composite Actions
 
 We use several composite actions to perform various tasks shared by our module workflows:
 
-| Composite Action              | Description                                                                                                                                                                                                                                                                                                                                                                       |
-| ----------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **validateModulePester**      | This action performs [static tests](#static-module-validation) for a module using Pester, including API versions focused tests to avoid those become stale overtime.                                                                                                                                                                                                              |
-| **validateModuleDeployment:** | This action performs the following tasks: <li> A [simulated deployment](#simulated-deployment-validation) using a provided parameter file. <li>An [actual deployment](#test-deploy) to Azure using a provided parameter file. <li>The [removal](#removal) of the test-deployed resources                                                                                          |
-| **publishModule:**            | This action is capable of [publishing](#publish) the given template to a location specified in the pipeline [variable file](#github-component-variable-file).                                                                                                                                                                                                                     |
-| **getWorkflowInput:**         | This action allows us to fetch workflow input values from the module's workflow file, even if the pipeline was not triggered via a `workflow_dispatch` action. Without it we would not be able to process the contained information and would need to duplicate the configuration as workflow variables. Such input values are for example the removal switch `removeDeployment`. |
+| Composite Action | Description |
+| - | - |
+| **validateModulePester** | This action performs [static tests](#static-module-validation) for a module using Pester, including API versions focused tests to avoid those become stale overtime. |
+| **validateModuleDeployment:** | This action performs the following tasks: <li> A [simulated deployment](#simulated-deployment-validation) using a provided parameter file. <li>An [actual deployment](#test-deploy) to Azure using a provided parameter file. <li>The [removal](#removal) of the test-deployed resources |
+| **publishModule:** | This action is capable of [publishing](#publish) the given template to a location specified in the pipeline [variable file](#github-component-variable-file). |
+| **getWorkflowInput:** | This action allows us to fetch workflow input values from the module's workflow file, even if the pipeline was not triggered via a `workflow_dispatch` action. Without it we would not be able to process the contained information and would need to duplicate the configuration as workflow variables. Such input values are for example the removal switch `removeDeployment`. |
 
 ### **GitHub Component:** Workflows
 
@@ -286,10 +286,10 @@ Comparing multiple workflows you'll notice they are almost identical, yet differ
     branches:
       - main
     paths:
-      - ".github/actions/templates/**"
-      - ".github/workflows/ms.network.virtualwans.yml"
-      - "arm/Microsoft.Network/virtualWans/**"
-      - "!arm/Microsoft.Network/virtualWans/readme.md"
+      - '.github/actions/templates/**'
+      - '.github/workflows/ms.network.virtualwans.yml'
+      - 'arm/Microsoft.Network/virtualWans/**'
+      - '!arm/Microsoft.Network/virtualWans/readme.md'
   ```
 
 - The **_environment variables_**
@@ -303,8 +303,8 @@ Comparing multiple workflows you'll notice they are almost identical, yet differ
 
   ```yaml
   env:
-    modulePath: "arm/Microsoft.Network/virtualWans"
-    workflowPath: ".github/workflows/ms.network.virtualwans.yml"
+    modulePath: 'arm/Microsoft.Network/virtualWans'
+    workflowPath: '.github/workflows/ms.network.virtualwans.yml'
   ```
 
 ## Azure DevOps Pipelines
@@ -329,7 +329,7 @@ The variable group can be set up under _Pipelines: Library_ as described [here](
 
 ```yaml
 variables:
-  - group: "PLATFORM_VARIABLES"
+  - group: 'PLATFORM_VARIABLES'
 ```
 
 ### **Azure DevOps Component:** Variable file
@@ -338,15 +338,14 @@ The variable file is a source controlled configuration file to control the behav
 
 This file is divided into multiple categories of variables used in the pipelines:
 
-| Section                                      | Description                                                                                                                                                     |
-| -------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **Agent settings**                           | Contains information of the agent and service connection to use                                                                                                 |
-| **Source**                                   | Contains information about the Azure DevOps instance itself, including some important folder paths                                                              |
-| **Validation deployment settings**           | Contains the default deployment information to use in the pipeline. For example, the default location to deploy resources to                                    |
-| **Publish: Template-Spec settings**          | Contains the required information to publish to template-specs, including a switch to toggle the publishing to template specs on or off                         |
-| **Publish: Universal packages settings**     | Contains the required information to publish to universal packages, including a switch to toggle the publishing to universal packages on or off                 |
-| **Publish: Private Bicep Registry settings** | Contains the required information to publish to the private bicep registry, including a switch to toggle the publishing to the private bicep registry on or off |
-| **Azure PowerShell Version**                 | Contains information about the default PowerShell version to use in the pipeline                                                                                |
+| Section | Description |
+| - | - |
+| **Agent settings** | Contains information of the agent and service connection to use |
+| **Source** | Contains information about the Azure DevOps instance itself, including some important folder paths |
+| **Validation deployment settings** | Contains the default deployment information to use in the pipeline. For example, the default location to deploy resources to |
+| **Publish: Template-Spec settings** | Contains the required information to publish to template-specs, including a switch to toggle the publishing to template specs on or off |
+| **Publish: Universal packages settings** | Contains the required information to publish to universal packages, including a switch to toggle the publishing to universal packages on or off |
+| **Azure PowerShell Version** | Contains information about the default PowerShell version to use in the pipeline |
 
 More information about the contained variables can be found in the linked file itself.
 
@@ -369,7 +368,7 @@ These are the individual end-to-end pipelines we have for each module. Leveragin
 While they look very similar they have specific areas in which they differ:
 
 - The **_path filters_** of the pipeline trigger:
-  Purpose | Example |
+  | Purpose | Example |
   | - | - |
   | Include the templates | `- '/.azuredevops/pipelineTemplates/module.*.yml'` |
   | Include the relative path to the pipeline itself | `- '/.azuredevops/modulePipelines/ms.analysisservices.servers.yml' ` |
@@ -386,11 +385,11 @@ While they look very similar they have specific areas in which they differ:
         - main
     paths:
       include:
-        - "/.azuredevops/modulePipelines/ms.analysisservices.servers.yml"
-        - "/.azuredevops/pipelineTemplates/module.*.yml"
-        - "/arm/Microsoft.AnalysisServices/servers/*"
+        - '/.azuredevops/modulePipelines/ms.analysisservices.servers.yml'
+        - '/.azuredevops/pipelineTemplates/module.*.yml'
+        - '/arm/Microsoft.AnalysisServices/servers/*'
       exclude:
-        - "/**/*.md"
+        - '/**/*.md'
   ```
 
   > **_Note:_** By the time of this writing, wildcards are temporarily not supported by Azure DevOps
@@ -407,10 +406,10 @@ While they look very similar they have specific areas in which they differ:
 
   ```yaml
   variables:
-    - template: "/.azuredevops/pipelineVariables/global.variables.yml"
-    - group: "PLATFORM_VARIABLES"
+    - template: '/.azuredevops/pipelineVariables/global.variables.yml'
+    - group: 'PLATFORM_VARIABLES'
     - name: modulePath
-      value: "/arm/Microsoft.AnalysisServices/servers"
+      value: '/arm/Microsoft.AnalysisServices/servers'
   ```
 
 #### Azure DevOps Artifacts

From 99eb09f68e6e4869231769e64cd185c1297a4dd7 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 13:55:33 +0100
Subject: [PATCH 114/121] Added unintended removed chapter

---
 docs/wiki/PipelinesDesign.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index 6c667f1606..9a91640a30 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -345,6 +345,7 @@ This file is divided into multiple categories of variables used in the pipelines
 | **Validation deployment settings** | Contains the default deployment information to use in the pipeline. For example, the default location to deploy resources to |
 | **Publish: Template-Spec settings** | Contains the required information to publish to template-specs, including a switch to toggle the publishing to template specs on or off |
 | **Publish: Universal packages settings** | Contains the required information to publish to universal packages, including a switch to toggle the publishing to universal packages on or off |
+| **Publish: Private Bicep Registry settings** | Contains the required information to publish to the private bicep registry, including a switch to toggle the publishing to the private bicep registry on or off |
 | **Azure PowerShell Version** | Contains information about the default PowerShell version to use in the pipeline |
 
 More information about the contained variables can be found in the linked file itself.

From 7bc684d69f93935d20100de78d33ffb6f9cad983 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 15:24:15 +0100
Subject: [PATCH 115/121] Added scenario

---
 docs/wiki/PipelinesDesign.md | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index 9a91640a30..a95dba8c6a 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -118,6 +118,39 @@ The publishing works as follows:
    1. The major (`x.0`) and minor (`0.x`) version are set based on the file `version.json` in the module folder.
    1. The patch (`0.0.x`) version is calculated based on the number of commits on the `HEAD` ref. This will cause the patch version to never reset to 0 with major and/or minor increment, as specified for [semver](https://semver.org/).
 
+**Example scenario**
+
+Lets look at an example run where we would do a patch change on the `fileShares` module:
+1. A new branch is created for further development of the fileShare module.
+2. Bug-fixes, documentation, and security updates are added to the fileShare module by the author. The `version.json` file is not changed in either the child or parent module folders.
+3. The author runs a manual workflow based on their development branch, with the 'publish pre-release' option enabled.
+4. A prerelease run of publishing triggers after test and validation of the module.
+   - For the child and parent modules, the module version's major and minor version is read from the `version.json` file in the module folder respectively.
+   - The patch is calculated based on the total number of commits in history on the branch (independent on the module).
+   - As the pipeline is not running based on the 'default branch', a prerelease segment (`-prerelease`) is added to the version.
+   - The version results in being `0.3.501-prerelease`. The child and parent modules may have different major and minor versions, but the patch version will be the same in this case. Other unmodified child modules of `storageAccount` will not be republished and remain with the existin version.
+5. Sequential commits on the branch and runs of the module pipeline, with the 'publish pre-release' option enabled results in the following versions being published:
+   - `0.3.502-prerelease`
+   - `0.3.503-prerelease`
+   - ...
+   - `0.3.506-prerelease`
+6. When the branch is merged to the default branch, the only thing that changes is the patch version and the removal of the `-prerelease` segment.
+   - The number of commits will at this point be calculated based on the number of commits on the default branch.
+   - Assuming the development branch started from commit 500 on the default branch, and the author added 6 commits on the development branch, the prerelease versions will reach `0.3.506-prerelease`.
+   - Meanwhile, there can be changes (let's say 2 squashed PR merges) on the default branch that is pushing its number of commits in history further.
+   - If the PR for the changes to `fileShare` is squash merged as commit number 503, the patch version on the child and parent module is then `503`, resulting in a version `0.3.503` being published.
+
+```
+                  \         \
+C499 -> C500 ---> C501 ---> C502 ---> C503 (503)
+        \                            /
+         D1 --> D2 --> D3 ... --> D6
+        (501)  (502)  (503)      (506)
+```
+`Cx` - Commits on main,
+`Dx` - Commits on development branch,
+`(x)` - Calculated patch version
+
 ## Shared concepts
 
 There are several concepts that are shared among the phases. Most notably

From 440805dcb0020b9efaf1a3db952bc611144be3a6 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 15:25:50 +0100
Subject: [PATCH 116/121] Test version degrade 0.3->0.2 to test publishing

---
 arm/Microsoft.AnalysisServices/servers/deploy.bicep | 1 +
 arm/Microsoft.AnalysisServices/servers/version.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index a49d21a2f0..d1ff5ddc39 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,6 +19,7 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
+
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/arm/Microsoft.AnalysisServices/servers/version.json b/arm/Microsoft.AnalysisServices/servers/version.json
index 08ec8d7491..09da9cf49c 100644
--- a/arm/Microsoft.AnalysisServices/servers/version.json
+++ b/arm/Microsoft.AnalysisServices/servers/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.2"
 }

From a35ede79414af1b362610f92fe47cd411dc52eba Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 17:56:36 +0100
Subject: [PATCH 117/121] Fix

---
 .../servers/deploy.bicep                          |  1 -
 .../resourcePublish/Get-ModulesToUpdate.ps1       | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/arm/Microsoft.AnalysisServices/servers/deploy.bicep b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
index d1ff5ddc39..a49d21a2f0 100644
--- a/arm/Microsoft.AnalysisServices/servers/deploy.bicep
+++ b/arm/Microsoft.AnalysisServices/servers/deploy.bicep
@@ -19,7 +19,6 @@ param firewallSettings object = {
   enablePowerBIService: true
 }
 
-
 @description('Optional. Location for all Resources.')
 param location string = resourceGroup().location
 
diff --git a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1 b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
index 9af90e89f3..5bc3ca2381 100644
--- a/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
+++ b/utilities/pipelines/resourcePublish/Get-ModulesToUpdate.ps1
@@ -368,10 +368,21 @@ Generates a hashtable with template file paths to update with a new version.
 Mandatory. Path to a deploy.bicep/json file.
 
 .EXAMPLE
-Get-ModulesToUpdate -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\tableServices\tables\deploy.bicep'
+Get-ModulesToUpdate -TemplateFilePath 'C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\deploy.bicep'
+
+
+Name               Value
+----               -----
+TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\fileServices\shares\deploy.bicep
+Version            0.3.848-prerelease
+TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\fileServices\deploy.bicep
+Version            0.3.848-prerelease
+TemplateFilePath   C:\Repos\Azure\ResourceModules\arm\Microsoft.Storage\storageAccounts\deploy.bicep
+Version            0.3.848-prerelease
+
+Generates a hashtable with template file paths to update and their new versions.
 
 
-#TODO: Generates a hashtable with template file paths to update with a new version.
 #>#
 function Get-ModulesToUpdate {
 

From bbe3f521226582fd315a9a6d67c8070b8cd29b94 Mon Sep 17 00:00:00 2001
From: Marius Storhaug <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 17:59:26 +0100
Subject: [PATCH 118/121] Update docs/wiki/PipelinesDesign.md

Co-authored-by: Alexander Sehr <ASehr@hotmail.de>
---
 docs/wiki/PipelinesDesign.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index a95dba8c6a..39815bf6df 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -128,7 +128,7 @@ Lets look at an example run where we would do a patch change on the `fileShares`
    - For the child and parent modules, the module version's major and minor version is read from the `version.json` file in the module folder respectively.
    - The patch is calculated based on the total number of commits in history on the branch (independent on the module).
    - As the pipeline is not running based on the 'default branch', a prerelease segment (`-prerelease`) is added to the version.
-   - The version results in being `0.3.501-prerelease`. The child and parent modules may have different major and minor versions, but the patch version will be the same in this case. Other unmodified child modules of `storageAccount` will not be republished and remain with the existin version.
+   - The version results in being `0.3.501-prerelease`. The child and parent modules may have different major and minor versions, but the patch version will be the same in this case. Other unmodified child modules of `storageAccount` will not be republished and remain with the existing version.
 5. Sequential commits on the branch and runs of the module pipeline, with the 'publish pre-release' option enabled results in the following versions being published:
    - `0.3.502-prerelease`
    - `0.3.503-prerelease`

From cbb86f79ea9daaf329aacba949b9d4cc5e28a51c Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Sun, 30 Jan 2022 18:07:01 +0100
Subject: [PATCH 119/121] Updated doc on powershell scripts

---
 .../Publish-ModuleToPrivateBicepRegistry.ps1              | 2 +-
 .../resourcePublish/Publish-ModuleToTemplateSpec.ps1      | 2 +-
 .../Publish-ModuleToUniversalArtifactFeed.ps1             | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
index cbffcf51c9..584582b4e1 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToPrivateBicepRegistry.ps1
@@ -28,7 +28,7 @@ Example: 'West Europe'
 .EXAMPLE
 Publish-ModuleToPrivateBicepRegistry -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -BicepRegistryName 'adpsxxazacrx001' -BicepRegistryRgName 'artifacts-rg'
 
-Try to publish the KeyVault module with version .0.0-alpha o a private bicep registry called KeKeyVVult value provided in the UI
+Try to publish the KeyVault module with version 3.0.0-alpha to a private bicep registry called 'adpsxxazacrx001' in resource group 'artifacts-rg'.
 #>
 function Publish-ModuleToPrivateBicepRegistry {
 
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
index 6a2d1c00df..1a0a883a5f 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToTemplateSpec.ps1
@@ -29,7 +29,7 @@ Example: 'iacs key vault'
 .EXAMPLE
 Publish-ModuleToTemplateSpec -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -TemplateSpecsRgName 'artifacts-rg' -TemplateSpecsRgLocation 'West Europe' -TemplateSpecsDescription 'iacs key vault'
 
-Try to publish the KeyVault module with version 3.0.0 to a template spec called KeyVault based on a value provided in the UI
+Try to publish the KeyVault module with version 3.0.0-alpha to a template spec in resource group 'artifacts-rg'.
 #>
 function Publish-ModuleToTemplateSpec {
 
diff --git a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1 b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
index 33c8176731..21d792f3c4 100644
--- a/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
+++ b/utilities/pipelines/resourcePublish/Publish-ModuleToUniversalArtifactFeed.ps1
@@ -1,9 +1,9 @@
 <#
 .SYNOPSIS
-Publish a new version of a given module to a artifact feed
+Publish a new version of a given module to an Azure DevOps artifact feed as a universal package.
 
 .DESCRIPTION
-Publish a new version of a given module to aDartifact feed
+Publish a new version of a given module to an Azure DevOps artifact feed as a universal package.
 
 .PARAMETER TemplateFilePath
 Mandatory. Path to the module deployment file from root.
@@ -13,7 +13,7 @@ Example: 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep'
 Mandatory. Version of the module to publish, following SemVer convention.
 Example: '1.0.0', '2.1.5-alpha.1', '0.0.5-beta.1'
 
-.PARAMETER vstsOrganizationUri
+.PARAMETER VstsOrganizationUri
 Mandatory. Azure DevOps organization URL hosting the artifacts feed.
 Example: 'https://dev.azure.com/fabrikam/'.
 
@@ -31,7 +31,7 @@ Optional. The bearer token to use to authenticate the request. If not provided i
 .EXAMPLE
 Publish-ModuleToUniversalArtifactFeed -TemplateFilePath 'C:\arm\Microsoft.KeyVault\vaults\deploy.bicep' -ModuleVersion '3.0.0-alpha' -vstsOrganizationUri 'https://dev.azure.com/fabrikam' -VstsProject 'IaC' -VstsFeedName 'Artifacts'
 
-Try to publish the KeyVault module with version 3.0.0-alpha to a Universal Package Feed called KeyVault in the feed called 'Artifacts' under the project 'IaC'.
+Try to publish the KeyVault module with version 3.0.0-alpha to a Universal Package Feed called 'Artifacts' under the project 'IaC'.
 #>
 function Publish-ModuleToUniversalArtifactFeed {
 

From c6a696d635c187ccac8445739e67c23ae9051781 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Mon, 31 Jan 2022 17:43:34 +0100
Subject: [PATCH 120/121] Update docs with input from @eriqua

---
 docs/wiki/PipelinesDesign.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/wiki/PipelinesDesign.md b/docs/wiki/PipelinesDesign.md
index 39815bf6df..e96b22dd63 100644
--- a/docs/wiki/PipelinesDesign.md
+++ b/docs/wiki/PipelinesDesign.md
@@ -121,12 +121,12 @@ The publishing works as follows:
 **Example scenario**
 
 Lets look at an example run where we would do a patch change on the `fileShares` module:
-1. A new branch is created for further development of the fileShare module.
-2. Bug-fixes, documentation, and security updates are added to the fileShare module by the author. The `version.json` file is not changed in either the child or parent module folders.
+1. A new branch is created for further development of the `fileShare` module. Let's assume the new branch started from commit `500` on the default branch and the `version.json` of the `fileShare` module contains major and minor `0.3`.
+2. Bug-fixes, documentation, and security updates are added to the `fileShare` module by the author. The `version.json` file is not changed in either the child or parent module folders.
 3. The author runs a manual workflow based on their development branch, with the 'publish pre-release' option enabled.
 4. A prerelease run of publishing triggers after test and validation of the module.
-   - For the child and parent modules, the module version's major and minor version is read from the `version.json` file in the module folder respectively.
-   - The patch is calculated based on the total number of commits in history on the branch (independent on the module).
+   - For the child and parent modules, the module version's major and minor version is read from the `version.json` file in the module folder respectively. Being unchanged, it still contains the version `0.3`.
+   - The patch is calculated based on the total number of commits in history on the branch (independent on the module). The new branch started from commit `500` on the default branch and 1 commit has been pushed, so the total number of commits on the new branch is `501`.
    - As the pipeline is not running based on the 'default branch', a prerelease segment (`-prerelease`) is added to the version.
    - The version results in being `0.3.501-prerelease`. The child and parent modules may have different major and minor versions, but the patch version will be the same in this case. Other unmodified child modules of `storageAccount` will not be republished and remain with the existing version.
 5. Sequential commits on the branch and runs of the module pipeline, with the 'publish pre-release' option enabled results in the following versions being published:

From 23a9c7ecde119614c625df4c62a7a16118dca0d5 Mon Sep 17 00:00:00 2001
From: Marius <Marius.Storhaug@microsoft.com>
Date: Tue, 1 Feb 2022 10:18:10 +0100
Subject: [PATCH 121/121] Update version files

---
 arm/Microsoft.AnalysisServices/servers/version.json           | 2 +-
 .../service/apiVersionSets/version.json                       | 2 +-
 .../service/apis/policies/version.json                        | 2 +-
 arm/Microsoft.ApiManagement/service/apis/version.json         | 2 +-
 .../service/authorizationServers/version.json                 | 2 +-
 arm/Microsoft.ApiManagement/service/backends/version.json     | 2 +-
 arm/Microsoft.ApiManagement/service/caches/version.json       | 2 +-
 .../service/identityProviders/version.json                    | 2 +-
 arm/Microsoft.ApiManagement/service/namedValues/version.json  | 2 +-
 arm/Microsoft.ApiManagement/service/policies/version.json     | 2 +-
 .../service/portalsettings/version.json                       | 2 +-
 .../service/products/apis/version.json                        | 2 +-
 .../service/products/groups/version.json                      | 2 +-
 arm/Microsoft.ApiManagement/service/products/version.json     | 2 +-
 .../service/subscriptions/version.json                        | 2 +-
 arm/Microsoft.ApiManagement/service/version.json              | 2 +-
 arm/Microsoft.Authorization/policyAssignments/version.json    | 2 +-
 arm/Microsoft.Authorization/policyDefinitions/version.json    | 2 +-
 arm/Microsoft.Authorization/policyExemptions/version.json     | 2 +-
 arm/Microsoft.Authorization/policySetDefinitions/version.json | 2 +-
 arm/Microsoft.Authorization/roleAssignments/version.json      | 2 +-
 arm/Microsoft.Authorization/roleDefinitions/version.json      | 2 +-
 arm/Microsoft.Automanage/accounts/version.json                | 4 ----
 .../automationAccounts/jobSchedules/version.json              | 2 +-
 .../automationAccounts/modules/version.json                   | 2 +-
 .../automationAccounts/runbooks/version.json                  | 2 +-
 .../automationAccounts/schedules/version.json                 | 2 +-
 .../softwareUpdateConfigurations/version.json                 | 2 +-
 .../automationAccounts/variables/version.json                 | 2 +-
 arm/Microsoft.Automation/automationAccounts/version.json      | 2 +-
 arm/Microsoft.Batch/batchAccounts/version.json                | 2 +-
 arm/Microsoft.CognitiveServices/accounts/version.json         | 2 +-
 arm/Microsoft.Compute/availabilitySets/version.json           | 2 +-
 arm/Microsoft.Compute/diskEncryptionSets/version.json         | 2 +-
 arm/Microsoft.Compute/disks/version.json                      | 2 +-
 arm/Microsoft.Compute/galleries/images/version.json           | 2 +-
 arm/Microsoft.Compute/galleries/version.json                  | 2 +-
 arm/Microsoft.Compute/images/version.json                     | 2 +-
 arm/Microsoft.Compute/proximityPlacementGroups/version.json   | 2 +-
 .../virtualMachineScaleSets/extensions/version.json           | 2 +-
 arm/Microsoft.Compute/virtualMachineScaleSets/version.json    | 2 +-
 arm/Microsoft.Compute/virtualMachines/extensions/version.json | 2 +-
 arm/Microsoft.Compute/virtualMachines/version.json            | 2 +-
 arm/Microsoft.Consumption/budgets/version.json                | 2 +-
 arm/Microsoft.ContainerInstance/containerGroups/version.json  | 2 +-
 arm/Microsoft.ContainerRegistry/registries/version.json       | 2 +-
 .../managedClusters/agentPools/version.json                   | 2 +-
 arm/Microsoft.ContainerService/managedClusters/version.json   | 2 +-
 .../factories/integrationRuntime/version.json                 | 2 +-
 .../factories/managedVirtualNetwork/version.json              | 2 +-
 arm/Microsoft.DataFactory/factories/version.json              | 2 +-
 arm/Microsoft.Databricks/workspaces/version.json              | 2 +-
 .../applicationgroups/applications/version.json               | 2 +-
 .../applicationgroups/version.json                            | 2 +-
 arm/Microsoft.DesktopVirtualization/hostpools/version.json    | 2 +-
 arm/Microsoft.DesktopVirtualization/workspaces/version.json   | 2 +-
 .../mongodbDatabases/collections/version.json                 | 2 +-
 .../databaseAccounts/mongodbDatabases/version.json            | 2 +-
 .../databaseAccounts/sqlDatabases/containers/version.json     | 2 +-
 .../databaseAccounts/sqlDatabases/version.json                | 2 +-
 arm/Microsoft.DocumentDB/databaseAccounts/version.json        | 2 +-
 arm/Microsoft.EventGrid/topics/version.json                   | 2 +-
 .../namespaces/authorizationRules/version.json                | 2 +-
 .../namespaces/disasterRecoveryConfigs/version.json           | 2 +-
 .../namespaces/eventhubs/authorizationRules/version.json      | 2 +-
 .../namespaces/eventhubs/consumergroups/version.json          | 2 +-
 arm/Microsoft.EventHub/namespaces/eventhubs/version.json      | 2 +-
 arm/Microsoft.EventHub/namespaces/version.json                | 2 +-
 arm/Microsoft.HealthBot/healthBots/version.json               | 2 +-
 arm/Microsoft.Insights/actionGroups/version.json              | 2 +-
 arm/Microsoft.Insights/activityLogAlerts/version.json         | 2 +-
 arm/Microsoft.Insights/components/version.json                | 2 +-
 arm/Microsoft.Insights/diagnosticSettings/version.json        | 2 +-
 arm/Microsoft.Insights/metricAlerts/version.json              | 2 +-
 .../privateLinkScopes/scopedResources/version.json            | 2 +-
 arm/Microsoft.Insights/privateLinkScopes/version.json         | 2 +-
 arm/Microsoft.Insights/scheduledQueryRules/version.json       | 2 +-
 arm/Microsoft.KeyVault/vaults/accessPolicies/version.json     | 2 +-
 arm/Microsoft.KeyVault/vaults/keys/version.json               | 2 +-
 arm/Microsoft.KeyVault/vaults/secrets/version.json            | 2 +-
 arm/Microsoft.KeyVault/vaults/version.json                    | 2 +-
 arm/Microsoft.Logic/workflows/version.json                    | 2 +-
 arm/Microsoft.MachineLearningServices/workspaces/version.json | 2 +-
 .../userAssignedIdentities/version.json                       | 2 +-
 .../registrationDefinitions/version.json                      | 2 +-
 arm/Microsoft.Management/managementGroups/version.json        | 2 +-
 .../netAppAccounts/capacityPools/version.json                 | 2 +-
 .../netAppAccounts/capacityPools/volumes/version.json         | 2 +-
 arm/Microsoft.NetApp/netAppAccounts/version.json              | 2 +-
 arm/Microsoft.Network/applicationGateways/version.json        | 2 +-
 arm/Microsoft.Network/applicationSecurityGroups/version.json  | 2 +-
 arm/Microsoft.Network/azureFirewalls/version.json             | 2 +-
 arm/Microsoft.Network/bastionHosts/version.json               | 2 +-
 arm/Microsoft.Network/connections/version.json                | 2 +-
 arm/Microsoft.Network/ddosProtectionPlans/version.json        | 2 +-
 arm/Microsoft.Network/expressRouteCircuits/version.json       | 2 +-
 .../firewallPolicies/ruleCollectionGroups/version.json        | 2 +-
 .../firewallPolicies/ruleGroups/version.json                  | 2 +-
 arm/Microsoft.Network/firewallPolicies/version.json           | 2 +-
 arm/Microsoft.Network/ipGroups/version.json                   | 2 +-
 .../loadBalancers/backendAddressPools/version.json            | 2 +-
 .../loadBalancers/inboundNatRules/version.json                | 2 +-
 arm/Microsoft.Network/loadBalancers/version.json              | 2 +-
 arm/Microsoft.Network/localNetworkGateways/version.json       | 2 +-
 arm/Microsoft.Network/natGateways/version.json                | 2 +-
 arm/Microsoft.Network/networkSecurityGroups/version.json      | 2 +-
 .../networkWatchers/connectionMonitors/version.json           | 2 +-
 arm/Microsoft.Network/networkWatchers/flowLogs/version.json   | 2 +-
 arm/Microsoft.Network/networkWatchers/version.json            | 2 +-
 arm/Microsoft.Network/privateDnsZones/version.json            | 2 +-
 .../privateDnsZones/virtualNetworkLinks/version.json          | 2 +-
 .../privateEndpoints/privateDnsZoneGroups/version.json        | 2 +-
 arm/Microsoft.Network/privateEndpoints/version.json           | 2 +-
 arm/Microsoft.Network/publicIPAddresses/version.json          | 2 +-
 arm/Microsoft.Network/publicIPPrefixes/version.json           | 2 +-
 arm/Microsoft.Network/routeTables/version.json                | 2 +-
 arm/Microsoft.Network/trafficmanagerprofiles/version.json     | 2 +-
 arm/Microsoft.Network/virtualNetworkGateways/version.json     | 2 +-
 arm/Microsoft.Network/virtualNetworks/subnets/version.json    | 2 +-
 arm/Microsoft.Network/virtualNetworks/version.json            | 2 +-
 .../virtualNetworks/virtualNetworkPeerings/version.json       | 2 +-
 arm/Microsoft.Network/virtualWans/version.json                | 2 +-
 .../workspaces/dataSources/version.json                       | 2 +-
 .../workspaces/linkedServices/version.json                    | 2 +-
 .../workspaces/savedSearches/version.json                     | 2 +-
 .../workspaces/storageInsightConfigs/version.json             | 2 +-
 arm/Microsoft.OperationalInsights/workspaces/version.json     | 2 +-
 .../vaults/backupConfig/version.json                          | 2 +-
 .../vaults/backupPolicies/version.json                        | 2 +-
 .../vaults/backupStorageConfig/version.json                   | 2 +-
 .../vaults/protectionContainers/version.json                  | 2 +-
 arm/Microsoft.RecoveryServices/vaults/version.json            | 2 +-
 arm/Microsoft.Resources/deploymentScripts/version.json        | 2 +-
 arm/Microsoft.Resources/resourceGroups/version.json           | 2 +-
 arm/Microsoft.Security/azureSecurityCenter/version.json       | 2 +-
 .../namespaces/authorizationRules/version.json                | 2 +-
 .../namespaces/disasterRecoveryConfigs/version.json           | 2 +-
 .../namespaces/ipFilterRules/version.json                     | 2 +-
 .../namespaces/migrationConfigurations/version.json           | 2 +-
 .../namespaces/queues/authorizationRules/version.json         | 2 +-
 arm/Microsoft.ServiceBus/namespaces/queues/version.json       | 2 +-
 arm/Microsoft.ServiceBus/namespaces/version.json              | 2 +-
 .../namespaces/virtualNetworkRules/version.json               | 2 +-
 .../clusters/applicationTypes/version.json                    | 2 +-
 arm/Microsoft.ServiceFabric/clusters/version.json             | 2 +-
 .../managedInstances/administrators/version.json              | 2 +-
 .../databases/backupLongTermRetentionPolicies/version.json    | 2 +-
 .../databases/backupShortTermRetentionPolicies/version.json   | 2 +-
 arm/Microsoft.Sql/managedInstances/databases/version.json     | 2 +-
 .../managedInstances/encryptionProtector/version.json         | 2 +-
 arm/Microsoft.Sql/managedInstances/keys/version.json          | 2 +-
 .../managedInstances/securityAlertPolicies/version.json       | 2 +-
 arm/Microsoft.Sql/managedInstances/version.json               | 2 +-
 .../managedInstances/vulnerabilityAssessments/version.json    | 2 +-
 arm/Microsoft.Sql/servers/databases/version.json              | 2 +-
 arm/Microsoft.Sql/servers/firewallRules/version.json          | 2 +-
 arm/Microsoft.Sql/servers/securityAlertPolicies/version.json  | 2 +-
 arm/Microsoft.Sql/servers/version.json                        | 2 +-
 .../blobServices/containers/immutabilityPolicies/version.json | 2 +-
 .../storageAccounts/blobServices/containers/version.json      | 2 +-
 .../storageAccounts/blobServices/version.json                 | 2 +-
 .../storageAccounts/fileServices/shares/version.json          | 2 +-
 .../storageAccounts/fileServices/version.json                 | 2 +-
 .../storageAccounts/managementPolicies/version.json           | 2 +-
 .../storageAccounts/queueServices/queues/version.json         | 2 +-
 .../storageAccounts/queueServices/version.json                | 2 +-
 .../storageAccounts/tableServices/tables/version.json         | 2 +-
 .../storageAccounts/tableServices/version.json                | 2 +-
 arm/Microsoft.Storage/storageAccounts/version.json            | 2 +-
 arm/Microsoft.Synapse/privateLinkHubs/version.json            | 2 +-
 .../imageTemplates/version.json                               | 2 +-
 arm/Microsoft.Web/connections/version.json                    | 2 +-
 arm/Microsoft.Web/hostingEnvironments/version.json            | 2 +-
 arm/Microsoft.Web/serverfarms/version.json                    | 2 +-
 arm/Microsoft.Web/sites/config/version.json                   | 2 +-
 arm/Microsoft.Web/sites/version.json                          | 2 +-
 176 files changed, 175 insertions(+), 179 deletions(-)
 delete mode 100644 arm/Microsoft.Automanage/accounts/version.json

diff --git a/arm/Microsoft.AnalysisServices/servers/version.json b/arm/Microsoft.AnalysisServices/servers/version.json
index 09da9cf49c..56f8d9ca40 100644
--- a/arm/Microsoft.AnalysisServices/servers/version.json
+++ b/arm/Microsoft.AnalysisServices/servers/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.2"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json b/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json
+++ b/arm/Microsoft.ApiManagement/service/apiVersionSets/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/apis/policies/version.json b/arm/Microsoft.ApiManagement/service/apis/policies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/apis/policies/version.json
+++ b/arm/Microsoft.ApiManagement/service/apis/policies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/apis/version.json b/arm/Microsoft.ApiManagement/service/apis/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/apis/version.json
+++ b/arm/Microsoft.ApiManagement/service/apis/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/authorizationServers/version.json b/arm/Microsoft.ApiManagement/service/authorizationServers/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/authorizationServers/version.json
+++ b/arm/Microsoft.ApiManagement/service/authorizationServers/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/backends/version.json b/arm/Microsoft.ApiManagement/service/backends/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/backends/version.json
+++ b/arm/Microsoft.ApiManagement/service/backends/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/caches/version.json b/arm/Microsoft.ApiManagement/service/caches/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/caches/version.json
+++ b/arm/Microsoft.ApiManagement/service/caches/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/identityProviders/version.json b/arm/Microsoft.ApiManagement/service/identityProviders/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/identityProviders/version.json
+++ b/arm/Microsoft.ApiManagement/service/identityProviders/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/namedValues/version.json b/arm/Microsoft.ApiManagement/service/namedValues/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/namedValues/version.json
+++ b/arm/Microsoft.ApiManagement/service/namedValues/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/policies/version.json b/arm/Microsoft.ApiManagement/service/policies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/policies/version.json
+++ b/arm/Microsoft.ApiManagement/service/policies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/portalsettings/version.json b/arm/Microsoft.ApiManagement/service/portalsettings/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/portalsettings/version.json
+++ b/arm/Microsoft.ApiManagement/service/portalsettings/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/products/apis/version.json b/arm/Microsoft.ApiManagement/service/products/apis/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/products/apis/version.json
+++ b/arm/Microsoft.ApiManagement/service/products/apis/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/products/groups/version.json b/arm/Microsoft.ApiManagement/service/products/groups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/products/groups/version.json
+++ b/arm/Microsoft.ApiManagement/service/products/groups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/products/version.json b/arm/Microsoft.ApiManagement/service/products/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/products/version.json
+++ b/arm/Microsoft.ApiManagement/service/products/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/subscriptions/version.json b/arm/Microsoft.ApiManagement/service/subscriptions/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/subscriptions/version.json
+++ b/arm/Microsoft.ApiManagement/service/subscriptions/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ApiManagement/service/version.json b/arm/Microsoft.ApiManagement/service/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ApiManagement/service/version.json
+++ b/arm/Microsoft.ApiManagement/service/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Authorization/policyAssignments/version.json b/arm/Microsoft.Authorization/policyAssignments/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Authorization/policyAssignments/version.json
+++ b/arm/Microsoft.Authorization/policyAssignments/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Authorization/policyDefinitions/version.json b/arm/Microsoft.Authorization/policyDefinitions/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Authorization/policyDefinitions/version.json
+++ b/arm/Microsoft.Authorization/policyDefinitions/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Authorization/policyExemptions/version.json b/arm/Microsoft.Authorization/policyExemptions/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Authorization/policyExemptions/version.json
+++ b/arm/Microsoft.Authorization/policyExemptions/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Authorization/policySetDefinitions/version.json b/arm/Microsoft.Authorization/policySetDefinitions/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Authorization/policySetDefinitions/version.json
+++ b/arm/Microsoft.Authorization/policySetDefinitions/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Authorization/roleAssignments/version.json b/arm/Microsoft.Authorization/roleAssignments/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Authorization/roleAssignments/version.json
+++ b/arm/Microsoft.Authorization/roleAssignments/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Authorization/roleDefinitions/version.json b/arm/Microsoft.Authorization/roleDefinitions/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Authorization/roleDefinitions/version.json
+++ b/arm/Microsoft.Authorization/roleDefinitions/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Automanage/accounts/version.json b/arm/Microsoft.Automanage/accounts/version.json
deleted file mode 100644
index 08ec8d7491..0000000000
--- a/arm/Microsoft.Automanage/accounts/version.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
-}
diff --git a/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json b/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json
+++ b/arm/Microsoft.Automation/automationAccounts/jobSchedules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Automation/automationAccounts/modules/version.json b/arm/Microsoft.Automation/automationAccounts/modules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Automation/automationAccounts/modules/version.json
+++ b/arm/Microsoft.Automation/automationAccounts/modules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Automation/automationAccounts/runbooks/version.json b/arm/Microsoft.Automation/automationAccounts/runbooks/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Automation/automationAccounts/runbooks/version.json
+++ b/arm/Microsoft.Automation/automationAccounts/runbooks/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Automation/automationAccounts/schedules/version.json b/arm/Microsoft.Automation/automationAccounts/schedules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Automation/automationAccounts/schedules/version.json
+++ b/arm/Microsoft.Automation/automationAccounts/schedules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
+++ b/arm/Microsoft.Automation/automationAccounts/softwareUpdateConfigurations/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Automation/automationAccounts/variables/version.json b/arm/Microsoft.Automation/automationAccounts/variables/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Automation/automationAccounts/variables/version.json
+++ b/arm/Microsoft.Automation/automationAccounts/variables/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Automation/automationAccounts/version.json b/arm/Microsoft.Automation/automationAccounts/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Automation/automationAccounts/version.json
+++ b/arm/Microsoft.Automation/automationAccounts/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Batch/batchAccounts/version.json b/arm/Microsoft.Batch/batchAccounts/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Batch/batchAccounts/version.json
+++ b/arm/Microsoft.Batch/batchAccounts/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.CognitiveServices/accounts/version.json b/arm/Microsoft.CognitiveServices/accounts/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.CognitiveServices/accounts/version.json
+++ b/arm/Microsoft.CognitiveServices/accounts/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/availabilitySets/version.json b/arm/Microsoft.Compute/availabilitySets/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/availabilitySets/version.json
+++ b/arm/Microsoft.Compute/availabilitySets/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/diskEncryptionSets/version.json b/arm/Microsoft.Compute/diskEncryptionSets/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/diskEncryptionSets/version.json
+++ b/arm/Microsoft.Compute/diskEncryptionSets/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/disks/version.json b/arm/Microsoft.Compute/disks/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/disks/version.json
+++ b/arm/Microsoft.Compute/disks/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/galleries/images/version.json b/arm/Microsoft.Compute/galleries/images/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/galleries/images/version.json
+++ b/arm/Microsoft.Compute/galleries/images/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/galleries/version.json b/arm/Microsoft.Compute/galleries/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/galleries/version.json
+++ b/arm/Microsoft.Compute/galleries/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/images/version.json b/arm/Microsoft.Compute/images/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/images/version.json
+++ b/arm/Microsoft.Compute/images/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/proximityPlacementGroups/version.json b/arm/Microsoft.Compute/proximityPlacementGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/proximityPlacementGroups/version.json
+++ b/arm/Microsoft.Compute/proximityPlacementGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
+++ b/arm/Microsoft.Compute/virtualMachineScaleSets/extensions/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/virtualMachineScaleSets/version.json b/arm/Microsoft.Compute/virtualMachineScaleSets/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/virtualMachineScaleSets/version.json
+++ b/arm/Microsoft.Compute/virtualMachineScaleSets/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/virtualMachines/extensions/version.json b/arm/Microsoft.Compute/virtualMachines/extensions/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/virtualMachines/extensions/version.json
+++ b/arm/Microsoft.Compute/virtualMachines/extensions/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Compute/virtualMachines/version.json b/arm/Microsoft.Compute/virtualMachines/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Compute/virtualMachines/version.json
+++ b/arm/Microsoft.Compute/virtualMachines/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Consumption/budgets/version.json b/arm/Microsoft.Consumption/budgets/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Consumption/budgets/version.json
+++ b/arm/Microsoft.Consumption/budgets/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ContainerInstance/containerGroups/version.json b/arm/Microsoft.ContainerInstance/containerGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ContainerInstance/containerGroups/version.json
+++ b/arm/Microsoft.ContainerInstance/containerGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ContainerRegistry/registries/version.json b/arm/Microsoft.ContainerRegistry/registries/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ContainerRegistry/registries/version.json
+++ b/arm/Microsoft.ContainerRegistry/registries/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json b/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json
+++ b/arm/Microsoft.ContainerService/managedClusters/agentPools/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ContainerService/managedClusters/version.json b/arm/Microsoft.ContainerService/managedClusters/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ContainerService/managedClusters/version.json
+++ b/arm/Microsoft.ContainerService/managedClusters/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json b/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json
+++ b/arm/Microsoft.DataFactory/factories/integrationRuntime/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
+++ b/arm/Microsoft.DataFactory/factories/managedVirtualNetwork/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DataFactory/factories/version.json b/arm/Microsoft.DataFactory/factories/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DataFactory/factories/version.json
+++ b/arm/Microsoft.DataFactory/factories/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Databricks/workspaces/version.json b/arm/Microsoft.Databricks/workspaces/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Databricks/workspaces/version.json
+++ b/arm/Microsoft.Databricks/workspaces/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
+++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/applications/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json b/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json
+++ b/arm/Microsoft.DesktopVirtualization/applicationgroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DesktopVirtualization/hostpools/version.json b/arm/Microsoft.DesktopVirtualization/hostpools/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DesktopVirtualization/hostpools/version.json
+++ b/arm/Microsoft.DesktopVirtualization/hostpools/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DesktopVirtualization/workspaces/version.json b/arm/Microsoft.DesktopVirtualization/workspaces/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DesktopVirtualization/workspaces/version.json
+++ b/arm/Microsoft.DesktopVirtualization/workspaces/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.DocumentDB/databaseAccounts/version.json b/arm/Microsoft.DocumentDB/databaseAccounts/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.DocumentDB/databaseAccounts/version.json
+++ b/arm/Microsoft.DocumentDB/databaseAccounts/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.EventGrid/topics/version.json b/arm/Microsoft.EventGrid/topics/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.EventGrid/topics/version.json
+++ b/arm/Microsoft.EventGrid/topics/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json b/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json
+++ b/arm/Microsoft.EventHub/namespaces/authorizationRules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
+++ b/arm/Microsoft.EventHub/namespaces/disasterRecoveryConfigs/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
+++ b/arm/Microsoft.EventHub/namespaces/eventhubs/authorizationRules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
+++ b/arm/Microsoft.EventHub/namespaces/eventhubs/consumergroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.EventHub/namespaces/eventhubs/version.json b/arm/Microsoft.EventHub/namespaces/eventhubs/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.EventHub/namespaces/eventhubs/version.json
+++ b/arm/Microsoft.EventHub/namespaces/eventhubs/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.EventHub/namespaces/version.json b/arm/Microsoft.EventHub/namespaces/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.EventHub/namespaces/version.json
+++ b/arm/Microsoft.EventHub/namespaces/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.HealthBot/healthBots/version.json b/arm/Microsoft.HealthBot/healthBots/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.HealthBot/healthBots/version.json
+++ b/arm/Microsoft.HealthBot/healthBots/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Insights/actionGroups/version.json b/arm/Microsoft.Insights/actionGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Insights/actionGroups/version.json
+++ b/arm/Microsoft.Insights/actionGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Insights/activityLogAlerts/version.json b/arm/Microsoft.Insights/activityLogAlerts/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Insights/activityLogAlerts/version.json
+++ b/arm/Microsoft.Insights/activityLogAlerts/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Insights/components/version.json b/arm/Microsoft.Insights/components/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Insights/components/version.json
+++ b/arm/Microsoft.Insights/components/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Insights/diagnosticSettings/version.json b/arm/Microsoft.Insights/diagnosticSettings/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Insights/diagnosticSettings/version.json
+++ b/arm/Microsoft.Insights/diagnosticSettings/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Insights/metricAlerts/version.json b/arm/Microsoft.Insights/metricAlerts/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Insights/metricAlerts/version.json
+++ b/arm/Microsoft.Insights/metricAlerts/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
+++ b/arm/Microsoft.Insights/privateLinkScopes/scopedResources/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Insights/privateLinkScopes/version.json b/arm/Microsoft.Insights/privateLinkScopes/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Insights/privateLinkScopes/version.json
+++ b/arm/Microsoft.Insights/privateLinkScopes/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Insights/scheduledQueryRules/version.json b/arm/Microsoft.Insights/scheduledQueryRules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Insights/scheduledQueryRules/version.json
+++ b/arm/Microsoft.Insights/scheduledQueryRules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json b/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json
+++ b/arm/Microsoft.KeyVault/vaults/accessPolicies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.KeyVault/vaults/keys/version.json b/arm/Microsoft.KeyVault/vaults/keys/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.KeyVault/vaults/keys/version.json
+++ b/arm/Microsoft.KeyVault/vaults/keys/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.KeyVault/vaults/secrets/version.json b/arm/Microsoft.KeyVault/vaults/secrets/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.KeyVault/vaults/secrets/version.json
+++ b/arm/Microsoft.KeyVault/vaults/secrets/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.KeyVault/vaults/version.json b/arm/Microsoft.KeyVault/vaults/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.KeyVault/vaults/version.json
+++ b/arm/Microsoft.KeyVault/vaults/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Logic/workflows/version.json b/arm/Microsoft.Logic/workflows/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Logic/workflows/version.json
+++ b/arm/Microsoft.Logic/workflows/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.MachineLearningServices/workspaces/version.json b/arm/Microsoft.MachineLearningServices/workspaces/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.MachineLearningServices/workspaces/version.json
+++ b/arm/Microsoft.MachineLearningServices/workspaces/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
+++ b/arm/Microsoft.ManagedIdentity/userAssignedIdentities/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ManagedServices/registrationDefinitions/version.json b/arm/Microsoft.ManagedServices/registrationDefinitions/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ManagedServices/registrationDefinitions/version.json
+++ b/arm/Microsoft.ManagedServices/registrationDefinitions/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Management/managementGroups/version.json b/arm/Microsoft.Management/managementGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Management/managementGroups/version.json
+++ b/arm/Microsoft.Management/managementGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
+++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
+++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.NetApp/netAppAccounts/version.json b/arm/Microsoft.NetApp/netAppAccounts/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.NetApp/netAppAccounts/version.json
+++ b/arm/Microsoft.NetApp/netAppAccounts/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/applicationGateways/version.json b/arm/Microsoft.Network/applicationGateways/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/applicationGateways/version.json
+++ b/arm/Microsoft.Network/applicationGateways/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/applicationSecurityGroups/version.json b/arm/Microsoft.Network/applicationSecurityGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/applicationSecurityGroups/version.json
+++ b/arm/Microsoft.Network/applicationSecurityGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/azureFirewalls/version.json b/arm/Microsoft.Network/azureFirewalls/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/azureFirewalls/version.json
+++ b/arm/Microsoft.Network/azureFirewalls/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/bastionHosts/version.json b/arm/Microsoft.Network/bastionHosts/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/bastionHosts/version.json
+++ b/arm/Microsoft.Network/bastionHosts/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/connections/version.json b/arm/Microsoft.Network/connections/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/connections/version.json
+++ b/arm/Microsoft.Network/connections/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/ddosProtectionPlans/version.json b/arm/Microsoft.Network/ddosProtectionPlans/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/ddosProtectionPlans/version.json
+++ b/arm/Microsoft.Network/ddosProtectionPlans/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/expressRouteCircuits/version.json b/arm/Microsoft.Network/expressRouteCircuits/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/expressRouteCircuits/version.json
+++ b/arm/Microsoft.Network/expressRouteCircuits/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
+++ b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json b/arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json
+++ b/arm/Microsoft.Network/firewallPolicies/ruleGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/firewallPolicies/version.json b/arm/Microsoft.Network/firewallPolicies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/firewallPolicies/version.json
+++ b/arm/Microsoft.Network/firewallPolicies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/ipGroups/version.json b/arm/Microsoft.Network/ipGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/ipGroups/version.json
+++ b/arm/Microsoft.Network/ipGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json b/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json
+++ b/arm/Microsoft.Network/loadBalancers/backendAddressPools/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json b/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json
+++ b/arm/Microsoft.Network/loadBalancers/inboundNatRules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/loadBalancers/version.json b/arm/Microsoft.Network/loadBalancers/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/loadBalancers/version.json
+++ b/arm/Microsoft.Network/loadBalancers/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/localNetworkGateways/version.json b/arm/Microsoft.Network/localNetworkGateways/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/localNetworkGateways/version.json
+++ b/arm/Microsoft.Network/localNetworkGateways/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/natGateways/version.json b/arm/Microsoft.Network/natGateways/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/natGateways/version.json
+++ b/arm/Microsoft.Network/natGateways/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/networkSecurityGroups/version.json b/arm/Microsoft.Network/networkSecurityGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/networkSecurityGroups/version.json
+++ b/arm/Microsoft.Network/networkSecurityGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json b/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json
+++ b/arm/Microsoft.Network/networkWatchers/connectionMonitors/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/version.json b/arm/Microsoft.Network/networkWatchers/flowLogs/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/networkWatchers/flowLogs/version.json
+++ b/arm/Microsoft.Network/networkWatchers/flowLogs/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/networkWatchers/version.json b/arm/Microsoft.Network/networkWatchers/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/networkWatchers/version.json
+++ b/arm/Microsoft.Network/networkWatchers/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/privateDnsZones/version.json b/arm/Microsoft.Network/privateDnsZones/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/privateDnsZones/version.json
+++ b/arm/Microsoft.Network/privateDnsZones/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
+++ b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
+++ b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/privateEndpoints/version.json b/arm/Microsoft.Network/privateEndpoints/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/privateEndpoints/version.json
+++ b/arm/Microsoft.Network/privateEndpoints/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/publicIPAddresses/version.json b/arm/Microsoft.Network/publicIPAddresses/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/publicIPAddresses/version.json
+++ b/arm/Microsoft.Network/publicIPAddresses/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/publicIPPrefixes/version.json b/arm/Microsoft.Network/publicIPPrefixes/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/publicIPPrefixes/version.json
+++ b/arm/Microsoft.Network/publicIPPrefixes/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/routeTables/version.json b/arm/Microsoft.Network/routeTables/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/routeTables/version.json
+++ b/arm/Microsoft.Network/routeTables/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/version.json b/arm/Microsoft.Network/trafficmanagerprofiles/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/trafficmanagerprofiles/version.json
+++ b/arm/Microsoft.Network/trafficmanagerprofiles/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/virtualNetworkGateways/version.json b/arm/Microsoft.Network/virtualNetworkGateways/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/virtualNetworkGateways/version.json
+++ b/arm/Microsoft.Network/virtualNetworkGateways/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/version.json b/arm/Microsoft.Network/virtualNetworks/subnets/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/virtualNetworks/subnets/version.json
+++ b/arm/Microsoft.Network/virtualNetworks/subnets/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/virtualNetworks/version.json b/arm/Microsoft.Network/virtualNetworks/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/virtualNetworks/version.json
+++ b/arm/Microsoft.Network/virtualNetworks/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
+++ b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Network/virtualWans/version.json b/arm/Microsoft.Network/virtualWans/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Network/virtualWans/version.json
+++ b/arm/Microsoft.Network/virtualWans/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json b/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json
+++ b/arm/Microsoft.OperationalInsights/workspaces/dataSources/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
+++ b/arm/Microsoft.OperationalInsights/workspaces/linkedServices/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
+++ b/arm/Microsoft.OperationalInsights/workspaces/savedSearches/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
+++ b/arm/Microsoft.OperationalInsights/workspaces/storageInsightConfigs/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.OperationalInsights/workspaces/version.json b/arm/Microsoft.OperationalInsights/workspaces/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.OperationalInsights/workspaces/version.json
+++ b/arm/Microsoft.OperationalInsights/workspaces/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json b/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json
+++ b/arm/Microsoft.RecoveryServices/vaults/backupConfig/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
+++ b/arm/Microsoft.RecoveryServices/vaults/backupPolicies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
+++ b/arm/Microsoft.RecoveryServices/vaults/backupStorageConfig/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
+++ b/arm/Microsoft.RecoveryServices/vaults/protectionContainers/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.RecoveryServices/vaults/version.json b/arm/Microsoft.RecoveryServices/vaults/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.RecoveryServices/vaults/version.json
+++ b/arm/Microsoft.RecoveryServices/vaults/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Resources/deploymentScripts/version.json b/arm/Microsoft.Resources/deploymentScripts/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Resources/deploymentScripts/version.json
+++ b/arm/Microsoft.Resources/deploymentScripts/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Resources/resourceGroups/version.json b/arm/Microsoft.Resources/resourceGroups/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Resources/resourceGroups/version.json
+++ b/arm/Microsoft.Resources/resourceGroups/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Security/azureSecurityCenter/version.json b/arm/Microsoft.Security/azureSecurityCenter/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Security/azureSecurityCenter/version.json
+++ b/arm/Microsoft.Security/azureSecurityCenter/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
+++ b/arm/Microsoft.ServiceBus/namespaces/authorizationRules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
+++ b/arm/Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
+++ b/arm/Microsoft.ServiceBus/namespaces/ipFilterRules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
+++ b/arm/Microsoft.ServiceBus/namespaces/migrationConfigurations/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
+++ b/arm/Microsoft.ServiceBus/namespaces/queues/authorizationRules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ServiceBus/namespaces/queues/version.json b/arm/Microsoft.ServiceBus/namespaces/queues/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ServiceBus/namespaces/queues/version.json
+++ b/arm/Microsoft.ServiceBus/namespaces/queues/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ServiceBus/namespaces/version.json b/arm/Microsoft.ServiceBus/namespaces/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ServiceBus/namespaces/version.json
+++ b/arm/Microsoft.ServiceBus/namespaces/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
+++ b/arm/Microsoft.ServiceBus/namespaces/virtualNetworkRules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json b/arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
+++ b/arm/Microsoft.ServiceFabric/clusters/applicationTypes/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.ServiceFabric/clusters/version.json b/arm/Microsoft.ServiceFabric/clusters/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.ServiceFabric/clusters/version.json
+++ b/arm/Microsoft.ServiceFabric/clusters/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/managedInstances/administrators/version.json b/arm/Microsoft.Sql/managedInstances/administrators/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/managedInstances/administrators/version.json
+++ b/arm/Microsoft.Sql/managedInstances/administrators/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
+++ b/arm/Microsoft.Sql/managedInstances/databases/backupLongTermRetentionPolicies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
+++ b/arm/Microsoft.Sql/managedInstances/databases/backupShortTermRetentionPolicies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/managedInstances/databases/version.json b/arm/Microsoft.Sql/managedInstances/databases/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/managedInstances/databases/version.json
+++ b/arm/Microsoft.Sql/managedInstances/databases/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json b/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json
+++ b/arm/Microsoft.Sql/managedInstances/encryptionProtector/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/managedInstances/keys/version.json b/arm/Microsoft.Sql/managedInstances/keys/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/managedInstances/keys/version.json
+++ b/arm/Microsoft.Sql/managedInstances/keys/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
+++ b/arm/Microsoft.Sql/managedInstances/securityAlertPolicies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/managedInstances/version.json b/arm/Microsoft.Sql/managedInstances/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/managedInstances/version.json
+++ b/arm/Microsoft.Sql/managedInstances/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
+++ b/arm/Microsoft.Sql/managedInstances/vulnerabilityAssessments/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/servers/databases/version.json b/arm/Microsoft.Sql/servers/databases/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/servers/databases/version.json
+++ b/arm/Microsoft.Sql/servers/databases/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/servers/firewallRules/version.json b/arm/Microsoft.Sql/servers/firewallRules/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/servers/firewallRules/version.json
+++ b/arm/Microsoft.Sql/servers/firewallRules/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json b/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json
+++ b/arm/Microsoft.Sql/servers/securityAlertPolicies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Sql/servers/version.json b/arm/Microsoft.Sql/servers/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Sql/servers/version.json
+++ b/arm/Microsoft.Sql/servers/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/containers/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/blobServices/version.json b/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/blobServices/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/fileServices/shares/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/fileServices/version.json b/arm/Microsoft.Storage/storageAccounts/fileServices/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/fileServices/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/fileServices/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json b/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/managementPolicies/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/queueServices/queues/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/queueServices/version.json b/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/queueServices/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/tables/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/tableServices/version.json b/arm/Microsoft.Storage/storageAccounts/tableServices/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/tableServices/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/tableServices/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Storage/storageAccounts/version.json b/arm/Microsoft.Storage/storageAccounts/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Storage/storageAccounts/version.json
+++ b/arm/Microsoft.Storage/storageAccounts/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Synapse/privateLinkHubs/version.json b/arm/Microsoft.Synapse/privateLinkHubs/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Synapse/privateLinkHubs/version.json
+++ b/arm/Microsoft.Synapse/privateLinkHubs/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json b/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json
+++ b/arm/Microsoft.VirtualMachineImages/imageTemplates/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Web/connections/version.json b/arm/Microsoft.Web/connections/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Web/connections/version.json
+++ b/arm/Microsoft.Web/connections/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Web/hostingEnvironments/version.json b/arm/Microsoft.Web/hostingEnvironments/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Web/hostingEnvironments/version.json
+++ b/arm/Microsoft.Web/hostingEnvironments/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Web/serverfarms/version.json b/arm/Microsoft.Web/serverfarms/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Web/serverfarms/version.json
+++ b/arm/Microsoft.Web/serverfarms/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Web/sites/config/version.json b/arm/Microsoft.Web/sites/config/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Web/sites/config/version.json
+++ b/arm/Microsoft.Web/sites/config/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }
diff --git a/arm/Microsoft.Web/sites/version.json b/arm/Microsoft.Web/sites/version.json
index 08ec8d7491..56f8d9ca40 100644
--- a/arm/Microsoft.Web/sites/version.json
+++ b/arm/Microsoft.Web/sites/version.json
@@ -1,4 +1,4 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "0.3"
+    "version": "0.4"
 }