PowerShell · iSazonov · Jan 14, 2020 · Jan 13, 2020 · Jan 13, 2020 · Jan 13, 2020
@@ -289,7 +289,7 @@ function Start-PSBuild {
         [switch]$Detailed
     )
 
-    if ($PsCmdlet.ParameterSetName -eq "Default" -and !$NoPSModuleRestore)
+    if ($PSCmdlet.ParameterSetName -eq "Default" -and !$NoPSModuleRestore)
     {
         $PSModuleRestore = $true
     }
@@ -438,7 +438,7 @@ Fix steps:
                 $Arguments += "/property:SDKToUse=Microsoft.NET.Sdk.WindowsDesktop"
             }
 
-            Write-Log "Run dotnet $Arguments from $pwd"
+            Write-Log "Run dotnet $Arguments from $PWD"
             Start-NativeExecution { dotnet $Arguments }
             Write-Log "PowerShell output: $($Options.Output)"
 
@@ -456,14 +456,14 @@ Fix steps:
                 $Arguments += "/property:SDKToUse=Microsoft.NET.Sdk.WindowsDesktop"
             }
 
-            Write-Log "Run dotnet $Arguments from $pwd"
+            Write-Log "Run dotnet $Arguments from $PWD"
             Start-NativeExecution { dotnet $Arguments }
             Write-Log "PowerShell output: $($Options.Output)"
 
             try {
                 Push-Location $globalToolSrcFolder
                 $Arguments += "--output", $publishPath
-                Write-Log "Run dotnet $Arguments from $pwd to build global tool entry point"
+                Write-Log "Run dotnet $Arguments from $PWD to build global tool entry point"
                 Start-NativeExecution { dotnet $Arguments }
             }
             finally {
@@ -498,7 +498,7 @@ Fix steps:
         $psVersion = $ReleaseTag
     }
     else {
-        $psVersion = git --git-dir="$PSSCriptRoot/.git" describe
+        $psVersion = git --git-dir="$PSScriptRoot/.git" describe
     }
 
     if ($Environment.IsRedHatFamily -or $Environment.IsDebian) {
@@ -1393,19 +1393,19 @@ function Show-PSPesterError
         [PSCustomObject]$testFailureObject
         )
 
-    if ($PSCmdLet.ParameterSetName -eq 'xml')
+    if ($PSCmdlet.ParameterSetName -eq 'xml')
     {
         $description = $testFailure.description
         $name = $testFailure.name
         $message = $testFailure.failure.message
-        $stackTrace = $testFailure.failure."stack-trace"
+        $StackTrace = $testFailure.failure."stack-trace"
     }
-    elseif ($PSCmdLet.ParameterSetName -eq 'object')
+    elseif ($PSCmdlet.ParameterSetName -eq 'object')
     {
         $description = $testFailureObject.Describe + '/' + $testFailureObject.Context
         $name = $testFailureObject.Name
         $message = $testFailureObject.FailureMessage
-        $stackTrace = $testFailureObject.StackTrace
+        $StackTrace = $testFailureObject.StackTrace
     }
     else
     {
@@ -1417,7 +1417,7 @@ function Show-PSPesterError
     Write-Log -Error "message:"
     Write-Log -Error $message
     Write-Log -Error "stack-trace:"
-    Write-Log -Error $stackTrace
+    Write-Log -Error $StackTrace
 
 }
 
@@ -1455,14 +1455,14 @@ function Test-XUnitTestResults
         $description = $failure.test.type
         $name = $failure.test.method
         $message = $failure.test.failure.message.'#cdata-section'
-        $stackTrace = $failure.test.failure.'stack-trace'.'#cdata-section'
+        $StackTrace = $failure.test.failure.'stack-trace'.'#cdata-section'
 
         Write-Log -Error ("Description: " + $description)
         Write-Log -Error ("Name:        " + $name)
         Write-Log -Error "message:"
         Write-Log -Error $message
         Write-Log -Error "stack-trace:"
-        Write-Log -Error $stackTrace
+        Write-Log -Error $StackTrace
     }
 
     throw "$($failedTests.failed) tests failed"
@@ -1488,7 +1488,7 @@ function Test-PSPesterResults
         [switch] $CanHaveNoResult
     )
 
-    if($PSCmdLet.ParameterSetName -eq 'file')
+    if($PSCmdlet.ParameterSetName -eq 'file')
     {
         if(!(Test-Path $TestResultsFile))
         {
@@ -1515,7 +1515,7 @@ function Test-PSPesterResults
             throw "$($x.'test-results'.failures) tests in $TestArea failed"
         }
     }
-    elseif ($PSCmdLet.ParameterSetName -eq 'PesterPassThruObject')
+    elseif ($PSCmdlet.ParameterSetName -eq 'PesterPassThruObject')
     {
         if ($ResultObject.TotalCount -le 0 -and -not $CanHaveNoResult)
         {
@@ -1646,7 +1646,7 @@ function Install-Dotnet {
         } else {
             # dotnet-install.ps1 uses APIs that are not supported in .NET Core, so we run it with Windows PowerShell
             $fullPSPath = Join-Path -Path $env:windir -ChildPath "System32\WindowsPowerShell\v1.0\powershell.exe"
-            $fullDotnetInstallPath = Join-Path -Path $pwd.Path -ChildPath $installScript
+            $fullDotnetInstallPath = Join-Path -Path $PWD.Path -ChildPath $installScript
             Start-NativeExecution { & $fullPSPath -NoLogo -NoProfile -File $fullDotnetInstallPath -Channel $Channel -Version $Version }
         }
     }
@@ -2385,7 +2385,7 @@ function Copy-PSGalleryModules
 
     $cache = dotnet nuget locals global-packages -l
     if ($cache -match "info : global-packages: (.*)") {
-        $nugetCache = $matches[1]
+        $nugetCache = $Matches[1]
     }
     else {
         throw "Can't find nuget global cache"
@@ -2400,7 +2400,7 @@ function Copy-PSGalleryModules
 
         # Remove the build revision from the src (nuget drops it).
         $srcVer = if ($version -match "(\d+.\d+.\d+).0") {
-            $matches[1]
+            $Matches[1]
         } elseif ($version -match "^\d+.\d+$") {
             # Two digit versions are stored as three digit versions
             "$version.0"

diff --git a/demos/crontab/CronTab/CronTab.psm1 b/demos/crontab/CronTab/CronTab.psm1
@@ -56,7 +56,7 @@ function Invoke-CronTab ([String] $user, [String[]] $arguments, [Switch] $noThro
 
     Write-Verbose "Running: $crontabcmd $arguments"
     $output = & $crontabcmd @arguments 2>&1
-    if ($LastExitCode -ne 0 -and -not $noThrow) {
+    if ($LASTEXITCODE -ne 0 -and -not $noThrow) {
         $e = New-Object System.InvalidOperationException -ArgumentList $output.Exception.Message
         throw $e
     } else {
@@ -125,7 +125,7 @@ function Remove-CronJob {
             $e = New-Object System.Exception -ArgumentList "Job not found"
             throw $e
         }
-        if ($Force -or $pscmdlet.ShouldProcess($Job.Command,"Remove")) {
+        if ($Force -or $PSCmdlet.ShouldProcess($Job.Command,"Remove")) {
             Import-CronTab -user $UserName -crontab $newcrontab
         }
     }

diff --git a/demos/rest/rest.ps1 b/demos/rest/rest.ps1
@@ -24,7 +24,7 @@ function Get-Issue
         {
             if ($link -match '\s*<(.*)>;\s+rel="next"')
             {
-                $uri = $matches[1]
+                $uri = $Matches[1]
             }
         }
     }

diff --git a/docker/tests/containerTestCommon.psm1 b/docker/tests/containerTestCommon.psm1
@@ -72,7 +72,7 @@ function Get-LinuxContainer
     {
         Write-Output @{
             Name = $os
-            Path = "$psscriptroot/../release/$os"
+            Path = "$PSScriptRoot/../release/$os"
         }
     }
 }
@@ -84,7 +84,7 @@ function Get-WindowsContainer
     {
         Write-Output @{
             Name = $os
-            Path = "$psscriptroot/../release/$os"
+            Path = "$PSScriptRoot/../release/$os"
         }
     }
 }
@@ -183,7 +183,7 @@ function Get-ContainerPowerShellVersion
     $runParams = @()
     $localVolumeName = $testContext.resolvedTestDrive
     $runParams += '--rm'
-    if($TestContext.Type -ne 'Windows' -and $isWindows)
+    if($TestContext.Type -ne 'Windows' -and $IsWindows)
     {
         # use a container volume on windows because host volumes are not automatic
         $volumeName = "test-volume-" + (Get-Random -Minimum 100 -Maximum 999)
@@ -204,7 +204,7 @@ function Get-ContainerPowerShellVersion
     $runParams += ('$PSVersionTable.PSVersion.ToString() | out-string | out-file -encoding ascii -FilePath '+$testContext.containerLogPath)
 
     $null = Invoke-Docker -Command run -Params $runParams -SuppressHostOutput
-    if($TestContext.Type -ne 'Windows' -and $isWindows)
+    if($TestContext.Type -ne 'Windows' -and $IsWindows)
     {
         $null = Invoke-Docker -Command cp -Params "${volumeName}:$($testContext.containerLogPath)", $TestContext.ResolvedLogPath
         $null = Invoke-Docker -Command container, rm -Params $volumeName, '--force' -SuppressHostOutput

diff --git a/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1 b/src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1
@@ -172,17 +172,17 @@ function Enable-PSWSManCombinedTrace
     $traceFileName = [string][Guid]::NewGuid()
     if ($DoNotOverwriteExistingTrace) {
         $fileName = [string][guid]::newguid()
-        $logfile = $pshome + "\\Traces\\PSTrace_$fileName.etl"
+        $logfile = $PSHOME + "\\Traces\\PSTrace_$fileName.etl"
     } else {
-        $logfile = $pshome + "\\Traces\\PSTrace.etl"
+        $logfile = $PSHOME + "\\Traces\\PSTrace.etl"
     }
 
     "Microsoft-Windows-PowerShell 0 5" | out-file $provfile -encoding ascii
     "Microsoft-Windows-WinRM 0 5" | out-file $provfile -encoding ascii -append
 
-    if (!(Test-Path $pshome\Traces))
+    if (!(Test-Path $PSHOME\Traces))
     {
-        New-Item -ItemType Directory -Force $pshome\Traces | out-null
+        New-Item -ItemType Directory -Force $PSHOME\Traces | out-null
     }
 
     if (Test-Path $logfile)

diff --git a/test/docker/networktest/DockerRemoting.Tests.ps1 b/test/docker/networktest/DockerRemoting.Tests.ps1
@@ -41,7 +41,7 @@ Describe "Basic remoting test with docker" -tags @("Scenario","Slow"){
 
         # capture the versions of full and core PowerShell
         write-verbose -verbose "getting powershell full version"
-        $fullVersion = docker exec $client powershell -c "`$psversiontable.psversion.tostring()"
+        $fullVersion = docker exec $client powershell -c "`$PSVersionTable.psversion.tostring()"
         if ( ! $fullVersion )
         {
             $pending = $true
@@ -50,7 +50,7 @@ Describe "Basic remoting test with docker" -tags @("Scenario","Slow"){
         }
 
         write-verbose -verbose "getting powershell version"
-        $coreVersion = docker exec $client "$powershellcorepath" -c "`$psversiontable.psversion.tostring()"
+        $coreVersion = docker exec $client "$powershellcorepath" -c "`$PSVersionTable.psversion.tostring()"
         if ( ! $coreVersion )
         {
             $pending = $true
@@ -68,22 +68,22 @@ Describe "Basic remoting test with docker" -tags @("Scenario","Slow"){
     }
 
     It "Full powershell can get correct remote powershell version" -pending:$pending {
-        $result = docker exec $client powershell -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -configurationname $powershellcoreConfiguration -auth basic -credential `$c; invoke-command -session `$ses { `$psversiontable.psversion.tostring() }"
+        $result = docker exec $client powershell -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -configurationname $powershellcoreConfiguration -auth basic -credential `$c; invoke-command -session `$ses { `$PSVersionTable.psversion.tostring() }"
         $result | Should -Be $coreVersion
     }
 
     It "Full powershell can get correct remote powershell full version" -pending:$pending {
-        $result = docker exec $client powershell -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -auth basic -credential `$c; invoke-command -session `$ses { `$psversiontable.psversion.tostring() }"
+        $result = docker exec $client powershell -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -auth basic -credential `$c; invoke-command -session `$ses { `$PSVersionTable.psversion.tostring() }"
         $result | Should -Be $fullVersion
     }
 
     It "Core powershell can get correct remote powershell version" -pending:$pending {
-        $result = docker exec $client "$powershellcorepath" -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -configurationname $powershellcoreConfiguration -auth basic -credential `$c; invoke-command -session `$ses { `$psversiontable.psversion.tostring() }"
+        $result = docker exec $client "$powershellcorepath" -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -configurationname $powershellcoreConfiguration -auth basic -credential `$c; invoke-command -session `$ses { `$PSVersionTable.psversion.tostring() }"
         $result | Should -Be $coreVersion
     }
 
     It "Core powershell can get correct remote powershell full version" -pending:$pending {
-        $result = docker exec $client "$powershellcorepath" -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -auth basic -credential `$c; invoke-command -session `$ses { `$psversiontable.psversion.tostring() }"
+        $result = docker exec $client "$powershellcorepath" -c "`$ss = [security.securestring]::new(); '11aa!!AA'.ToCharArray() | ForEach-Object { `$ss.appendchar(`$_)}; `$c = [pscredential]::new('testuser',`$ss); `$ses=new-pssession $serverhostname -auth basic -credential `$c; invoke-command -session `$ses { `$PSVersionTable.psversion.tostring() }"
         $result | Should -Be $fullVersion
     }
 }
diff --git a/test/packaging/windows/msi.tests.ps1 b/test/packaging/windows/msi.tests.ps1
@@ -28,7 +28,7 @@ function Invoke-Msiexec {
         [HashTable] $Properties
 
     )
-    $action = "$($PsCmdlet.ParameterSetName)ing"
+    $action = "$($PSCmdlet.ParameterSetName)ing"
     if ($Install.IsPresent) {
         $switch = '/I'
     } else {
@@ -70,10 +70,10 @@ Describe -Name "Windows MSI" -Fixture {
         $uploadedLog = $false
     }
     BeforeEach {
-        $Error.Clear()
+        $error.Clear()
     }
     AfterEach {
-        if ($Error.Count -ne 0 -and !$uploadedLog) {
+        if ($error.Count -ne 0 -and !$uploadedLog) {
             Copy-Item -Path $msiLog -Destination $env:temp -Force
             Write-Verbose "MSI log is at $env:temp\msilog.txt" -Verbose
             $uploadedLog = $true

diff --git a/test/powershell/Host/Base-Directory.Tests.ps1 b/test/powershell/Host/Base-Directory.Tests.ps1
@@ -3,7 +3,7 @@
 Describe "Configuration file locations" -tags "CI","Slow" {
 
     BeforeAll {
-        $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+        $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
         $profileName = "Microsoft.PowerShell_profile.ps1"
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ function Get-Issue @@
             {
                 if ($link -match '\s*<(.*)>;\s+rel="next"')
                 {
-                    $uri = $matches[1]
+                    $uri = $Matches[1]
                 }
             }
         }
@@ Expand Down @@