From 0c5a2f76c6f396509d59e68ed0e95294bbdd5364 Mon Sep 17 00:00:00 2001
From: LucasYao93 <53558334+LucasYao93@users.noreply.github.com>
Date: Wed, 1 Jul 2020 18:08:46 +0800
Subject: [PATCH 1/3] Copy generation imagebuilder code.

---
 src/ImageBuilder/Az.ImageBuilder.psm1         | 10 ++++-----
 src/ImageBuilder/check-dependencies.ps1       | 10 +++++----
 .../New-AzImageBuilderCustomizerObject.md     | 21 ++++++++++---------
 .../New-AzImageBuilderCustomizerObject.ps1    | 21 ++++++++++---------
 .../exports/ProxyCmdletDefinitions.ps1        | 21 ++++++++++---------
 src/ImageBuilder/generate-info.json           | 10 ++++-----
 .../runtime/BuildTime/Cmdlets/ExportPsd1.cs   |  2 +-
 src/ImageBuilder/help/Az.ImageBuilder.md      |  2 +-
 .../New-AzImageBuilderCustomizerObject.md     | 21 ++++++++++---------
 src/ImageBuilder/readme.md                    |  4 ++--
 10 files changed, 64 insertions(+), 58 deletions(-)

diff --git a/src/ImageBuilder/Az.ImageBuilder.psm1 b/src/ImageBuilder/Az.ImageBuilder.psm1
index 274a190a9799..a9b5ceb59535 100644
--- a/src/ImageBuilder/Az.ImageBuilder.psm1
+++ b/src/ImageBuilder/Az.ImageBuilder.psm1
@@ -24,17 +24,17 @@
       }
     }
     if(-not $accountsModule) {
-      $hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.7.4' } | Measure-Object).Count -gt 0
+      $hasAdequateVersion = (Get-Module -Name $accountsName -ListAvailable | Where-Object { $_.Version -ge [System.Version]'1.8.1' } | Measure-Object).Count -gt 0
       if($hasAdequateVersion) {
-        $accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.7.4 -Scope Global -PassThru
+        $accountsModule = Import-Module -Name $accountsName -MinimumVersion 1.8.1 -Scope Global -PassThru
       }
     }
   }
 
   if(-not $accountsModule) {
-    Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
-  } elseif (($accountsModule.Version -lt [System.Version]'1.7.4') -and (-not $localAccounts)) {
-    Write-Error "`nThis module requires $accountsName version 1.7.4 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
+    Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. For installation instructions, please see: https://docs.microsoft.com/en-us/powershell/azure/install-az-ps" -ErrorAction Stop
+  } elseif (($accountsModule.Version -lt [System.Version]'1.8.1') -and (-not $localAccounts)) {
+    Write-Error "`nThis module requires $accountsName version 1.8.1 or greater. An earlier version of Az.Accounts is imported in the current PowerShell session. If you are running test, please try to remove '.PSSharedModules' in your home directory. Otherwise please open a new PowerShell session and import this module again.`nAdditionally, this error could indicate that multiple incompatible versions of Azure PowerShell modules are installed on your system. For troubleshooting information, please see: https://aka.ms/azps-version-error" -ErrorAction Stop
   }
   Write-Information "Loaded Module '$($accountsModule.Name)'"
 
diff --git a/src/ImageBuilder/check-dependencies.ps1 b/src/ImageBuilder/check-dependencies.ps1
index 5cd7ab5c808f..513c52ca2fb5 100644
--- a/src/ImageBuilder/check-dependencies.ps1
+++ b/src/ImageBuilder/check-dependencies.ps1
@@ -21,13 +21,15 @@ if(-not $Isolated) {
   return
 }
 
-function DownloadModule ([bool]$predicate, [string]$path, [string]$moduleName, [string]$versionMinimum) {
+function DownloadModule ([bool]$predicate, [string]$path, [string]$moduleName, [string]$versionMinimum, [string]$requiredVersion) {
   if($predicate) {
     $module = Get-Module -ListAvailable -Name $moduleName
     if((-not $module) -or ($versionMinimum -and ($module | ForEach-Object { $_.Version } | Where-Object { $_ -ge [System.Version]$versionMinimum } | Measure-Object).Count -eq 0)) {
       $null = New-Item -ItemType Directory -Force -Path $path
       Write-Host -ForegroundColor Green "Installing local $moduleName module into '$path'..."
-      if($versionMinimum) {
+      if ($requiredVersion) {
+        Find-Module -Name $moduleName -RequiredVersion $requiredVersion -Repository PSGallery | Save-Module -Path $path
+      }elseif($versionMinimum) {
         Find-Module -Name $moduleName -MinimumVersion $versionMinimum -Repository PSGallery | Save-Module -Path $path
       } else {
         Find-Module -Name $moduleName -Repository PSGallery | Save-Module -Path $path
@@ -44,8 +46,8 @@ if(Test-Path -Path $localModulesPath) {
   $env:PSModulePath = "$localModulesPath$([IO.Path]::PathSeparator)$env:PSModulePath"
 }
 
-DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.7.4'
-DownloadModule -predicate ($all -or $Pester) -path $localModulesPath -moduleName 'Pester' -versionMinimum ''
+DownloadModule -predicate ($all -or $Accounts) -path $localModulesPath -moduleName 'Az.Accounts' -versionMinimum '1.8.1'
+DownloadModule -predicate ($all -or $Pester) -path $localModulesPath -moduleName 'Pester' -requiredVersion '4.10.1'
 
 $tools = Join-Path $PSScriptRoot 'tools'
 $resourceDir = Join-Path $tools 'Resources'
diff --git a/src/ImageBuilder/examples/New-AzImageBuilderCustomizerObject.md b/src/ImageBuilder/examples/New-AzImageBuilderCustomizerObject.md
index d5b461385900..36061b99e894 100644
--- a/src/ImageBuilder/examples/New-AzImageBuilderCustomizerObject.md
+++ b/src/ImageBuilder/examples/New-AzImageBuilderCustomizerObject.md
@@ -11,11 +11,11 @@ This command creates a windows update customizer.
 
 ### Example 2: Create a file customizer
 ```powershell
-PS C:\> New-AzImageBuilderCustomizerObject -FileCustomizer -CustomizerName 'filecus' -Sha256Checksum 'ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93' -Destination 'c:\\buildArtifacts\\index.html' -SourceUri 'https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html'
+PS C:\> New-AzImageBuilderCustomizerObject -FileCustomizer -CustomizerName 'filecus' -Destination 'c:\\buildArtifacts\\index.html' -SourceUri 'https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html'
 
-Name    Type Destination                    Sha256Checksum                                                   SourceUri
-----    ---- -----------                    --------------                                                   ---------
-filecus File c:\\buildArtifacts\\index.html ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html
+Name    Type Destination                    Sha256Checksum SourceUri
+----    ---- -----------                    -------------- ---------
+filecus File c:\\buildArtifacts\\index.html                https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/…
 
 ```
 
@@ -24,11 +24,12 @@ This command creates a file customizer.
 ### Example 3: Create a powershell customizer
 ```powershell
 PS C:\> $inline = @("mkdir c:\\buildActions", "echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt")
-PS C:\> New-AzImageBuilderCustomizerObject -PowerShellCustomizer -CustomizerName settingUpMgmtAgtPath -RunElevated $false -Sha256Checksum ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 -Inline $inline
+PS C:\> New-AzImageBuilderCustomizerObject -PowerShellCustomizer -CustomizerName settingUpMgmtAgtPath -RunElevated $false -Inline $inline
+
+Name                 Type       Inline                                                                                                  RunElevated ScriptUri Sha256Checksum
+----                 ----       ------                                                                                                  ----------- --------- --------------
+settingUpMgmtAgtPath PowerShell {mkdir c:\\buildActions, echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt} False
 
-Name                 Type       Inline                                                                                                  RunElevated ScriptUri Sha256Checksum                                      ValidExitC                                                                                                                                                                                                                                                                                                                                                                                                                                        e
-----                 ----       ------                                                                                                  ----------- --------- --------------                                       --
-settingUpMgmtAgtPath PowerShell {mkdir c:\\buildActions, echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt} False                 ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93
 ```
 
 This command creates a powershell customizer.
@@ -46,11 +47,11 @@ This command creates a restart customizer.
 
 ### Example 5: Create a shell customizer
 ```powershell
-PS C:\> New-AzImageBuilderCustomizerObject -ShellCustomizer -CustomizerName downloadBuildArtifacts -ScriptUri "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh" -Sha256Checksum ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 
+PS C:\> New-AzImageBuilderCustomizerObject -ShellCustomizer -CustomizerName downloadBuildArtifacts -ScriptUri "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh" 
 
 Name                   Type  Inline ScriptUri                                                                                                      Sha256Checksum
 ----                   ----  ------ ---------                                                                                                      --------------
-downloadBuildArtifacts Shell        https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93
+downloadBuildArtifacts Shell        https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh
 ```
 
 This command creates a shell customizer.
diff --git a/src/ImageBuilder/exports/New-AzImageBuilderCustomizerObject.ps1 b/src/ImageBuilder/exports/New-AzImageBuilderCustomizerObject.ps1
index d5384a9addba..1d8cc1906345 100644
--- a/src/ImageBuilder/exports/New-AzImageBuilderCustomizerObject.ps1
+++ b/src/ImageBuilder/exports/New-AzImageBuilderCustomizerObject.ps1
@@ -25,19 +25,20 @@ Name       Type          Filter                    SearchCriterion
 ----       ----          ------                    ---------------                -----------
 WindUpdate WindowsUpdate {BrowseOnly, IsInstalled} BrowseOnly=0 and IsInstalled=0 100
 .Example
-PS C:\> New-AzImageBuilderCustomizerObject -FileCustomizer -CustomizerName 'filecus' -Sha256Checksum 'ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93' -Destination 'c:\\buildArtifacts\\index.html' -SourceUri 'https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html'
+PS C:\> New-AzImageBuilderCustomizerObject -FileCustomizer -CustomizerName 'filecus' -Destination 'c:\\buildArtifacts\\index.html' -SourceUri 'https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html'
 
-Name    Type Destination                    Sha256Checksum                                                   SourceUri
-----    ---- -----------                    --------------                                                   ---------
-filecus File c:\\buildArtifacts\\index.html ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html
+Name    Type Destination                    Sha256Checksum SourceUri
+----    ---- -----------                    -------------- ---------
+filecus File c:\\buildArtifacts\\index.html                https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/…
 
 .Example
 PS C:\> $inline = @("mkdir c:\\buildActions", "echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt")
-PS C:\> New-AzImageBuilderCustomizerObject -PowerShellCustomizer -CustomizerName settingUpMgmtAgtPath -RunElevated $false -Sha256Checksum ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 -Inline $inline
+PS C:\> New-AzImageBuilderCustomizerObject -PowerShellCustomizer -CustomizerName settingUpMgmtAgtPath -RunElevated $false -Inline $inline
+
+Name                 Type       Inline                                                                                                  RunElevated ScriptUri Sha256Checksum
+----                 ----       ------                                                                                                  ----------- --------- --------------
+settingUpMgmtAgtPath PowerShell {mkdir c:\\buildActions, echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt} False
 
-Name                 Type       Inline                                                                                                  RunElevated ScriptUri Sha256Checksum                                      ValidExitC                                                                                                                                                                                                                                                                                                                                                                                                                                        e
-----                 ----       ------                                                                                                  ----------- --------- --------------                                       --
-settingUpMgmtAgtPath PowerShell {mkdir c:\\buildActions, echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt} False                 ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93
 .Example
 PS C:\> New-AzImageBuilderCustomizerObject -RestartCustomizer -CustomizerName 'restcus' -RestartCommand 'shutdown /f /r /t 0 /c \"packer restart\"' -RestartCheckCommand 'powershell -command "& {Write-Output "restarted."}"' -RestartTimeout '10m'
 
@@ -45,11 +46,11 @@ Name    Type           RestartCheckCommand                                 Resta
 ----    ----           -------------------                                 --------------                            --------------
 restcus WindowsRestart powershell -command "& {Write-Output "restarted."}" shutdown /f /r /t 0 /c \"packer restart\" 10m
 .Example
-PS C:\> New-AzImageBuilderCustomizerObject -ShellCustomizer -CustomizerName downloadBuildArtifacts -ScriptUri "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh" -Sha256Checksum ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 
+PS C:\> New-AzImageBuilderCustomizerObject -ShellCustomizer -CustomizerName downloadBuildArtifacts -ScriptUri "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh" 
 
 Name                   Type  Inline ScriptUri                                                                                                      Sha256Checksum
 ----                   ----  ------ ---------                                                                                                      --------------
-downloadBuildArtifacts Shell        https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93
+downloadBuildArtifacts Shell        https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh
 
 .Outputs
 Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Models.Api20200214.IImageTemplateCustomizer
diff --git a/src/ImageBuilder/exports/ProxyCmdletDefinitions.ps1 b/src/ImageBuilder/exports/ProxyCmdletDefinitions.ps1
index b398cbb016f4..67decedbb2c7 100644
--- a/src/ImageBuilder/exports/ProxyCmdletDefinitions.ps1
+++ b/src/ImageBuilder/exports/ProxyCmdletDefinitions.ps1
@@ -970,19 +970,20 @@ Name       Type          Filter                    SearchCriterion
 ----       ----          ------                    ---------------                -----------
 WindUpdate WindowsUpdate {BrowseOnly, IsInstalled} BrowseOnly=0 and IsInstalled=0 100
 .Example
-PS C:\> New-AzImageBuilderCustomizerObject -FileCustomizer -CustomizerName 'filecus' -Sha256Checksum 'ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93' -Destination 'c:\\buildArtifacts\\index.html' -SourceUri 'https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html'
+PS C:\> New-AzImageBuilderCustomizerObject -FileCustomizer -CustomizerName 'filecus' -Destination 'c:\\buildArtifacts\\index.html' -SourceUri 'https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html'
 
-Name    Type Destination                    Sha256Checksum                                                   SourceUri
-----    ---- -----------                    --------------                                                   ---------
-filecus File c:\\buildArtifacts\\index.html ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html
+Name    Type Destination                    Sha256Checksum SourceUri
+----    ---- -----------                    -------------- ---------
+filecus File c:\\buildArtifacts\\index.html                https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/…
 
 .Example
 PS C:\> $inline = @("mkdir c:\\buildActions", "echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt")
-PS C:\> New-AzImageBuilderCustomizerObject -PowerShellCustomizer -CustomizerName settingUpMgmtAgtPath -RunElevated $false -Sha256Checksum ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 -Inline $inline
+PS C:\> New-AzImageBuilderCustomizerObject -PowerShellCustomizer -CustomizerName settingUpMgmtAgtPath -RunElevated $false -Inline $inline
+
+Name                 Type       Inline                                                                                                  RunElevated ScriptUri Sha256Checksum
+----                 ----       ------                                                                                                  ----------- --------- --------------
+settingUpMgmtAgtPath PowerShell {mkdir c:\\buildActions, echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt} False
 
-Name                 Type       Inline                                                                                                  RunElevated ScriptUri Sha256Checksum                                      ValidExitC                                                                                                                                                                                                                                                                                                                                                                                                                                        e
-----                 ----       ------                                                                                                  ----------- --------- --------------                                       --
-settingUpMgmtAgtPath PowerShell {mkdir c:\\buildActions, echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt} False                 ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93
 .Example
 PS C:\> New-AzImageBuilderCustomizerObject -RestartCustomizer -CustomizerName 'restcus' -RestartCommand 'shutdown /f /r /t 0 /c \"packer restart\"' -RestartCheckCommand 'powershell -command "& {Write-Output "restarted."}"' -RestartTimeout '10m'
 
@@ -990,11 +991,11 @@ Name    Type           RestartCheckCommand                                 Resta
 ----    ----           -------------------                                 --------------                            --------------
 restcus WindowsRestart powershell -command "& {Write-Output "restarted."}" shutdown /f /r /t 0 /c \"packer restart\" 10m
 .Example
-PS C:\> New-AzImageBuilderCustomizerObject -ShellCustomizer -CustomizerName downloadBuildArtifacts -ScriptUri "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh" -Sha256Checksum ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 
+PS C:\> New-AzImageBuilderCustomizerObject -ShellCustomizer -CustomizerName downloadBuildArtifacts -ScriptUri "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh" 
 
 Name                   Type  Inline ScriptUri                                                                                                      Sha256Checksum
 ----                   ----  ------ ---------                                                                                                      --------------
-downloadBuildArtifacts Shell        https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93
+downloadBuildArtifacts Shell        https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh
 
 .Outputs
 Microsoft.Azure.PowerShell.Cmdlets.ImageBuilder.Models.Api20200214.IImageTemplateCustomizer
diff --git a/src/ImageBuilder/generate-info.json b/src/ImageBuilder/generate-info.json
index 59a7ef6599f2..2550f04b74e6 100644
--- a/src/ImageBuilder/generate-info.json
+++ b/src/ImageBuilder/generate-info.json
@@ -1,8 +1,8 @@
 {
+  "swagger_commit": "734319d8284f0bb20ba521808630be3e235ea344",
   "autorest_core": "3.0.6282",
-  "swagger_commit": "76b6bd1989a8248987219b840f525b02e07807dc",
-  "autorest_powershell": "2.1.384",
-  "node": "v10.16.3",
-  "autorest": "3.0.6149",
-  "autorest_remodeler": "2.1.27"
+  "autorest": "3.0.6187",
+  "node": "v10.16.0",
+  "autorest_remodeler": "2.1.27",
+  "autorest_powershell": "2.1.394"
 }
diff --git a/src/ImageBuilder/generated/runtime/BuildTime/Cmdlets/ExportPsd1.cs b/src/ImageBuilder/generated/runtime/BuildTime/Cmdlets/ExportPsd1.cs
index e4e5068dc7ed..0aad0dbfa1fe 100644
--- a/src/ImageBuilder/generated/runtime/BuildTime/Cmdlets/ExportPsd1.cs
+++ b/src/ImageBuilder/generated/runtime/BuildTime/Cmdlets/ExportPsd1.cs
@@ -49,7 +49,7 @@ protected override void ProcessRecord()
           throw new ArgumentException($"Custom folder '{CustomFolder}' does not exist");
         }
 
-        string version = Convert.ToString(@"0.1.1");
+        string version = Convert.ToString(@"0.1.0");
         // Validate the module version should be semantic version
         // Following regex is official from https://semver.org/
         Regex rx = new Regex(@"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$", RegexOptions.Compiled);
diff --git a/src/ImageBuilder/help/Az.ImageBuilder.md b/src/ImageBuilder/help/Az.ImageBuilder.md
index dd936831cfe6..467311569ca0 100644
--- a/src/ImageBuilder/help/Az.ImageBuilder.md
+++ b/src/ImageBuilder/help/Az.ImageBuilder.md
@@ -1,6 +1,6 @@
 ---
 Module Name: Az.ImageBuilder
-Module Guid: bdedc683-d9b6-41ea-b310-d068b8c72305
+Module Guid: 8ff047e4-15bb-4b53-a728-75641c49958b
 Download Help Link: https://docs.microsoft.com/en-us/powershell/module/az.imagebuilder
 Help Version: 1.0.0.0
 Locale: en-US
diff --git a/src/ImageBuilder/help/New-AzImageBuilderCustomizerObject.md b/src/ImageBuilder/help/New-AzImageBuilderCustomizerObject.md
index 19b063a51bbd..c72a96171086 100644
--- a/src/ImageBuilder/help/New-AzImageBuilderCustomizerObject.md
+++ b/src/ImageBuilder/help/New-AzImageBuilderCustomizerObject.md
@@ -61,11 +61,11 @@ This command creates a windows update customizer.
 
 ### Example 2: Create a file customizer
 ```powershell
-PS C:\> New-AzImageBuilderCustomizerObject -FileCustomizer -CustomizerName 'filecus' -Sha256Checksum 'ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93' -Destination 'c:\\buildArtifacts\\index.html' -SourceUri 'https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html'
+PS C:\> New-AzImageBuilderCustomizerObject -FileCustomizer -CustomizerName 'filecus' -Destination 'c:\\buildArtifacts\\index.html' -SourceUri 'https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html'
 
-Name    Type Destination                    Sha256Checksum                                                   SourceUri
-----    ---- -----------                    --------------                                                   ---------
-filecus File c:\\buildArtifacts\\index.html ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/index.html
+Name    Type Destination                    Sha256Checksum SourceUri
+----    ---- -----------                    -------------- ---------
+filecus File c:\\buildArtifacts\\index.html                https://github.com/danielsollondon/azvmimagebuilder/blob/master/quickquickstarts/exampleArtifacts/buildArtifacts/…
 
 ```
 
@@ -74,11 +74,12 @@ This command creates a file customizer.
 ### Example 3: Create a powershell customizer
 ```powershell
 PS C:\> $inline = @("mkdir c:\\buildActions", "echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt")
-PS C:\> New-AzImageBuilderCustomizerObject -PowerShellCustomizer -CustomizerName settingUpMgmtAgtPath -RunElevated $false -Sha256Checksum ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 -Inline $inline
+PS C:\> New-AzImageBuilderCustomizerObject -PowerShellCustomizer -CustomizerName settingUpMgmtAgtPath -RunElevated $false -Inline $inline
+
+Name                 Type       Inline                                                                                                  RunElevated ScriptUri Sha256Checksum
+----                 ----       ------                                                                                                  ----------- --------- --------------
+settingUpMgmtAgtPath PowerShell {mkdir c:\\buildActions, echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt} False
 
-Name                 Type       Inline                                                                                                  RunElevated ScriptUri Sha256Checksum                                      ValidExitC                                                                                                                                                                                                                                                                                                                                                                                                                                        e
-----                 ----       ------                                                                                                  ----------- --------- --------------                                       --
-settingUpMgmtAgtPath PowerShell {mkdir c:\\buildActions, echo Azure-Image-Builder-Was-Here  > c:\\buildActions\\buildActionsOutput.txt} False                 ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93
 ```
 
 This command creates a powershell customizer.
@@ -96,11 +97,11 @@ This command creates a restart customizer.
 
 ### Example 5: Create a shell customizer
 ```powershell
-PS C:\> New-AzImageBuilderCustomizerObject -ShellCustomizer -CustomizerName downloadBuildArtifacts -ScriptUri "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh" -Sha256Checksum ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93 
+PS C:\> New-AzImageBuilderCustomizerObject -ShellCustomizer -CustomizerName downloadBuildArtifacts -ScriptUri "https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh" 
 
 Name                   Type  Inline ScriptUri                                                                                                      Sha256Checksum
 ----                   ----  ------ ---------                                                                                                      --------------
-downloadBuildArtifacts Shell        https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh ade4c5214c3c675e92c66e2d067a870c5b81b9844b3de3cc72c49ff36425fc93
+downloadBuildArtifacts Shell        https://raw.githubusercontent.com/danielsollondon/azvmimagebuilder/master/quickquickstarts/customizeScript2.sh
 ```
 
 This command creates a shell customizer.
diff --git a/src/ImageBuilder/readme.md b/src/ImageBuilder/readme.md
index c25f3df4a846..ad4ef6e4ee36 100644
--- a/src/ImageBuilder/readme.md
+++ b/src/ImageBuilder/readme.md
@@ -17,7 +17,7 @@ This directory contains the PowerShell module for the ImageBuilder service.
 This module was primarily generated via [AutoRest](https://github.com/Azure/autorest) using the [PowerShell](https://github.com/Azure/autorest.powershell) extension.
 
 ## Module Requirements
-- [Az.Accounts module](https://www.powershellgallery.com/packages/Az.Accounts/), version 1.7.4 or greater
+- [Az.Accounts module](https://www.powershellgallery.com/packages/Az.Accounts/), version 1.8.1 or greater
 
 ## Authentication
 AutoRest does not generate authentication code for the module. Authentication is handled via Az.Accounts by altering the HTTP payload before it is sent.
@@ -53,7 +53,7 @@ input-file:
   - $(repo)/specification/imagebuilder/resource-manager/Microsoft.VirtualMachineImages/stable/2020-02-14/imagebuilder.json
 
 title: ImageBuilder
-module-version: 0.1.1
+module-version: 0.1.0
 subject-prefix: ''
 
 identity-correction-for-post: true

From 87e4d0fa1deb3314781ea81979ff1d1da2a36b86 Mon Sep 17 00:00:00 2001
From: LucasYao93 <53558334+LucasYao93@users.noreply.github.com>
Date: Wed, 1 Jul 2020 18:12:41 +0800
Subject: [PATCH 2/3] Update ChangeLog.md of imagebuilder.

---
 src/ImageBuilder/ChangeLog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ImageBuilder/ChangeLog.md b/src/ImageBuilder/ChangeLog.md
index 3413f2dc2f2b..feb881154e30 100644
--- a/src/ImageBuilder/ChangeLog.md
+++ b/src/ImageBuilder/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Remove `Sha256Checksum` parameter of example of `New-AzImageBuilderCustomizerObject`.
 
 ## Version 0.1.1
 * Made `Sha256Checksum` optional in `New-AzImageBuilderCustomizerObject`.

From 23b3b60c9b2cbe0a3a11257a3254e60a33fc5bc2 Mon Sep 17 00:00:00 2001
From: Dingmeng Xue <56333063+dingmeng-xue@users.noreply.github.com>
Date: Wed, 1 Jul 2020 18:52:30 +0800
Subject: [PATCH 3/3] Update ChangeLog.md

---
 src/ImageBuilder/ChangeLog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ImageBuilder/ChangeLog.md b/src/ImageBuilder/ChangeLog.md
index feb881154e30..89d709297e96 100644
--- a/src/ImageBuilder/ChangeLog.md
+++ b/src/ImageBuilder/ChangeLog.md
@@ -18,7 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
-* Remove `Sha256Checksum` parameter of example of `New-AzImageBuilderCustomizerObject`.
+* Removed `Sha256Checksum` parameter from example of `New-AzImageBuilderCustomizerObject`.
 
 ## Version 0.1.1
 * Made `Sha256Checksum` optional in `New-AzImageBuilderCustomizerObject`.