Remove Error Recording for The Expected Cases in Az.Tools.Installer (#22940)

msJinLei · web-flow · commit 64f0db5db23a · 2023-10-11T16:48:39.000+08:00
diff --git a/tools/Az.Tools.Installer/Az.Tools.Installer.psm1 b/tools/Az.Tools.Installer/Az.Tools.Installer.psm1
@@ -423,8 +423,8 @@ function Get-RepositoryUrl {
     }
 }
 
-$exportedFunctions = @( Get-ChildItem -Path $PSScriptRoot/exports/*.ps1 -Recurse -ErrorAction SilentlyContinue )
-$internalFunctions = @( Get-ChildItem -Path $PSScriptRoot/internal/*.ps1 -ErrorAction SilentlyContinue )
+$exportedFunctions = @( Get-ChildItem -Path $PSScriptRoot/exports/*.ps1 -Recurse -ErrorAction 'SilentlyContinue' )
+$internalFunctions = @( Get-ChildItem -Path $PSScriptRoot/internal/*.ps1 -ErrorAction 'SilentlyContinue' )
 
 $allFunctions = $internalFunctions + $exportedFunctions
 foreach ($function in $allFunctions) {
diff --git a/tools/Az.Tools.Installer/exports/Uninstall-AzModule.ps1 b/tools/Az.Tools.Installer/exports/Uninstall-AzModule.ps1
@@ -72,7 +72,7 @@ function Uninstall-AzModule {
             }
 
             if ($Force -or $PSCmdlet.ShouldProcess('Remove Az if installed', 'Az', 'Remove')) {
-                Uninstall-Module -Name 'Az' -AllVersion -ErrorAction SilentlyContinue -ErrorVariable +errorRecords
+                Uninstall-Module -Name 'Az' -AllVersion -ErrorAction 'SilentlyContinue'
             }
 
             Write-Progress -Id $script:FixProgressBarId "Check currently installed Az modules."
diff --git a/tools/Az.Tools.Installer/exports/Update-AzModule.ps1 b/tools/Az.Tools.Installer/exports/Update-AzModule.ps1
@@ -119,7 +119,7 @@ function Update-AzModule {
             }
 
             if ($Force -or $PSCmdlet.ShouldProcess('Remove Az if installed', 'Az', 'Remove')) {
-                Uninstall-Module -Name 'Az' -AllVersion -ErrorAction SilentlyContinue -ErrorVariable +errorRecords
+                Uninstall-Module -Name 'Az' -AllVersion -ErrorAction 'SilentlyContinue'
             }
 
             if ($moduleUpdateTable) {
diff --git a/tools/Az.Tools.Installer/internal/Add-RepositoryArgumentCompleter.ps1 b/tools/Az.Tools.Installer/internal/Add-RepositoryArgumentCompleter.ps1
@@ -24,12 +24,12 @@ function Add-RepositoryArgumentCompleter()
 
     try
     {
-        if(Get-Command -Name Register-ArgumentCompleter -ErrorAction SilentlyContinue)
+        if(Get-Command -Name Register-ArgumentCompleter -ErrorAction 'SilentlyContinue')
         {
             Register-ArgumentCompleter -CommandName $cmdlets -ParameterName $parameterName -ScriptBlock {
                 param($commandName, $parameterName, $wordToComplete, $commandAst, $fakeBoundParameter)
 
-                Get-PSRepository -Name "$wordTocomplete*"-ErrorAction SilentlyContinue -WarningAction SilentlyContinue | Foreach-Object {
+                Get-PSRepository -Name "$wordTocomplete*"-ErrorAction 'SilentlyContinue' -WarningAction 'SilentlyContinue' | Foreach-Object {
                     [System.Management.Automation.CompletionResult]::new($_.Name, $_.Name, 'ParameterValue', $_.Name)
                 }
             }
diff --git a/tools/Az.Tools.Installer/internal/Install-AzModuleInternal.ps1 b/tools/Az.Tools.Installer/internal/Install-AzModuleInternal.ps1
@@ -65,7 +65,7 @@ function Install-AzModuleInternal {
                 $null = Microsoft.PowerShell.Management\New-Item -ItemType Directory -Path $tempRepo -WhatIf:$false -ErrorVariable errorRecords
                 Write-Debug "[$Invoker] The repository folder $tempRepo is created."
 
-                PowerShellGet\Unregister-PSRepository -Name $script:AzTempRepoName -ErrorAction 'SilentlyContinue' -ErrorVariable errorRecords
+                PowerShellGet\Unregister-PSRepository -Name $script:AzTempRepoName -ErrorAction 'SilentlyContinue'
                 PowerShellGet\Register-PSRepository -Name $script:AzTempRepoName -SourceLocation $tempRepo -ErrorAction 'Stop' -ErrorVariable errorRecords
                 PowerShellGet\Set-PSRepository -Name $script:AzTempRepoName -InstallationPolicy Trusted -ErrorVariable errorRecords
                 Write-Debug "[$Invoker] The temporary repository $script:AzTempRepoName is registered."
@@ -171,7 +171,7 @@ function Install-AzModuleInternal {
                                 Import-Module PackageManagement
                                 Import-Module PowerShellGet -MinimumVersion 2.1.3 -MaximumVersion 3.0.0.0 -Scope Global
                                 if ($RemovePrevious) {
-                                    PowerShellGet\Uninstall-Module -Name $moduleName -AllVersion -AllowPrerelease -ErrorAction 'SilentlyContinue' -ErrorVariable +errorRecords
+                                    PowerShellGet\Uninstall-Module -Name $moduleName -AllVersion -AllowPrerelease -ErrorAction 'SilentlyContinue'
                                 }
                                 PowerShellGet\Install-Module @installModuleParam -Name $moduleName -RequiredVersion "$moduleVersion" -ErrorVariable +errorRecords
                                 $state = "succeeded"
diff --git a/tools/Az.Tools.Installer/internal/Install-AzModule_ByPath.ps1 b/tools/Az.Tools.Installer/internal/Install-AzModule_ByPath.ps1
@@ -55,7 +55,7 @@ function Install-AzModule_ByPath {
         }
 
         if ($Force -or $PSCmdlet.ShouldProcess('Remove Az if installed', 'Az', 'Remove')) {
-            PowerShellGet\Uninstall-Module -Name 'Az' -AllVersion -AllowPrerelease -ErrorAction SilentlyContinue -ErrorVariable +errorRecords
+            PowerShellGet\Uninstall-Module -Name 'Az' -AllVersion -AllowPrerelease -ErrorAction 'SilentlyContinue'
         }
 
         try {
@@ -70,7 +70,7 @@ function Install-AzModule_ByPath {
                 $null = Microsoft.PowerShell.Management\New-Item -ItemType Directory -Path $tempRepo -WhatIf:$false -ErrorVariable +errorRecords
                 Write-Debug "[$Invoker] The repository folder $tempRepo is created."
 
-                PowerShellGet\Unregister-PSRepository -Name $script:AzTempRepoName -ErrorAction 'SilentlyContinue' -ErrorVariable +errorRecords
+                PowerShellGet\Unregister-PSRepository -Name $script:AzTempRepoName -ErrorAction 'SilentlyContinue'
                 PowerShellGet\Register-PSRepository -Name $script:AzTempRepoName -SourceLocation $tempRepo -ErrorAction 'Stop' -ErrorVariable +errorRecords
                 PowerShellGet\Set-PSRepository -Name $script:AzTempRepoName -InstallationPolicy Trusted -ErrorVariable +errorRecords
                 Write-Debug "[$Invoker] The temporary repository $script:AzTempRepoName is registered."
diff --git a/tools/Az.Tools.Installer/internal/Install-AzModule_Default.ps1 b/tools/Az.Tools.Installer/internal/Install-AzModule_Default.ps1
@@ -99,7 +99,7 @@ function Install-AzModule_Default {
         }
 
         if ($Force -or $PSCmdlet.ShouldProcess('Remove Az if installed', 'Az', 'Remove')) {
-            PowerShellGet\Uninstall-Module -Name 'Az' -AllVersion -AllowPrerelease -ErrorAction SilentlyContinue -ErrorVariable +errorRecords
+            PowerShellGet\Uninstall-Module -Name 'Az' -AllVersion -AllowPrerelease -ErrorAction 'SilentlyContinue'
         }
 
         if ($modules) {

Original file line number	Diff line number	Diff line change
`@@ -423,8 +423,8 @@ function Get-RepositoryUrl {`
`423`	`423`	`}`
`424`	`424`	`}`
`425`	`425`
`426`		`-$exportedFunctions = @( Get-ChildItem -Path $PSScriptRoot/exports/*.ps1 -Recurse -ErrorAction SilentlyContinue )`
`427`		`-$internalFunctions = @( Get-ChildItem -Path $PSScriptRoot/internal/*.ps1 -ErrorAction SilentlyContinue )`
	`426`	`+$exportedFunctions = @( Get-ChildItem -Path $PSScriptRoot/exports/*.ps1 -Recurse -ErrorAction 'SilentlyContinue' )`
	`427`	`+$internalFunctions = @( Get-ChildItem -Path $PSScriptRoot/internal/*.ps1 -ErrorAction 'SilentlyContinue' )`
`428`	`428`
`429`	`429`	`$allFunctions = $internalFunctions + $exportedFunctions`
`430`	`430`	`foreach ($function in $allFunctions) {`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ function Uninstall-AzModule {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`if ($Force -or $PSCmdlet.ShouldProcess('Remove Az if installed', 'Az', 'Remove')) {`
`75`		`- Uninstall-Module -Name 'Az' -AllVersion -ErrorAction SilentlyContinue -ErrorVariable +errorRecords`
	`75`	`+ Uninstall-Module -Name 'Az' -AllVersion -ErrorAction 'SilentlyContinue'`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`Write-Progress -Id $script:FixProgressBarId "Check currently installed Az modules."`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ function Update-AzModule {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`if ($Force -or $PSCmdlet.ShouldProcess('Remove Az if installed', 'Az', 'Remove')) {`
`122`		`- Uninstall-Module -Name 'Az' -AllVersion -ErrorAction SilentlyContinue -ErrorVariable +errorRecords`
	`122`	`+ Uninstall-Module -Name 'Az' -AllVersion -ErrorAction 'SilentlyContinue'`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`if ($moduleUpdateTable) {`
Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ function Add-RepositoryArgumentCompleter()`
`24`	`24`
`25`	`25`	`try`
`26`	`26`	`{`
`27`		`- if(Get-Command -Name Register-ArgumentCompleter -ErrorAction SilentlyContinue)`
	`27`	`+ if(Get-Command -Name Register-ArgumentCompleter -ErrorAction 'SilentlyContinue')`
`28`	`28`	`{`
`29`	`29`	`Register-ArgumentCompleter -CommandName $cmdlets -ParameterName $parameterName -ScriptBlock {`
`30`	`30`	`param($commandName, $parameterName, $wordToComplete, $commandAst, $fakeBoundParameter)`
`31`	`31`
`32`		`- Get-PSRepository -Name "$wordTocomplete*"-ErrorAction SilentlyContinue -WarningAction SilentlyContinue \| Foreach-Object {`
	`32`	`+ Get-PSRepository -Name "$wordTocomplete*"-ErrorAction 'SilentlyContinue' -WarningAction 'SilentlyContinue' \| Foreach-Object {`
`33`	`33`	`[System.Management.Automation.CompletionResult]::new($_.Name, $_.Name, 'ParameterValue', $_.Name)`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ function Install-AzModule_ByPath {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if ($Force -or $PSCmdlet.ShouldProcess('Remove Az if installed', 'Az', 'Remove')) {`
`58`		`- PowerShellGet\Uninstall-Module -Name 'Az' -AllVersion -AllowPrerelease -ErrorAction SilentlyContinue -ErrorVariable +errorRecords`
	`58`	`+ PowerShellGet\Uninstall-Module -Name 'Az' -AllVersion -AllowPrerelease -ErrorAction 'SilentlyContinue'`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`try {`
`@@ -70,7 +70,7 @@ function Install-AzModule_ByPath {`
`70`	`70`	`$null = Microsoft.PowerShell.Management\New-Item -ItemType Directory -Path $tempRepo -WhatIf:$false -ErrorVariable +errorRecords`
`71`	`71`	`Write-Debug "[$Invoker] The repository folder $tempRepo is created."`
`72`	`72`
`73`		`- PowerShellGet\Unregister-PSRepository -Name $script:AzTempRepoName -ErrorAction 'SilentlyContinue' -ErrorVariable +errorRecords`
	`73`	`+ PowerShellGet\Unregister-PSRepository -Name $script:AzTempRepoName -ErrorAction 'SilentlyContinue'`
`74`	`74`	`PowerShellGet\Register-PSRepository -Name $script:AzTempRepoName -SourceLocation $tempRepo -ErrorAction 'Stop' -ErrorVariable +errorRecords`
`75`	`75`	`PowerShellGet\Set-PSRepository -Name $script:AzTempRepoName -InstallationPolicy Trusted -ErrorVariable +errorRecords`
`76`	`76`	`Write-Debug "[$Invoker] The temporary repository $script:AzTempRepoName is registered."`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ function Install-AzModule_Default {`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`if ($Force -or $PSCmdlet.ShouldProcess('Remove Az if installed', 'Az', 'Remove')) {`
`102`		`- PowerShellGet\Uninstall-Module -Name 'Az' -AllVersion -AllowPrerelease -ErrorAction SilentlyContinue -ErrorVariable +errorRecords`
	`102`	`+ PowerShellGet\Uninstall-Module -Name 'Az' -AllVersion -AllowPrerelease -ErrorAction 'SilentlyContinue'`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`if ($modules) {`