Correct case of $PSHOME special variable

xtqqczze · xtqqczze · commit e0d2e2aadefb · 2020-01-13T19:35:33.000Z
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/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"
     }
 
diff --git a/test/powershell/Host/ConsoleHost.Tests.ps1 b/test/powershell/Host/ConsoleHost.Tests.ps1
@@ -11,7 +11,7 @@ using namespace System.Diagnostics
 Describe 'minishell for native executables' -Tag 'CI' {
 
     BeforeAll {
-        $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+        $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
     }
 
     Context 'Streams from minishell' {
@@ -53,7 +53,7 @@ Describe 'minishell for native executables' -Tag 'CI' {
 Describe "ConsoleHost unit tests" -tags "Feature" {
 
     BeforeAll {
-        $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+        $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
         $ExitCodeBadCommandLineParameter = 64
 
         function NewProcessStartInfo([string]$CommandLine, [switch]$RedirectStdIn)
@@ -966,7 +966,7 @@ Describe "Pwsh exe resources tests" -Tag CI {
 
 Describe 'Pwsh startup in directories that contain wild cards' -Tag CI {
     BeforeAll {
-        $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+        $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
         $dirnames = "[T]est","[Test","T][est","Test"
         $testcases = @()
         foreach ( $d in $dirnames ) {
diff --git a/test/powershell/Host/Logging.Tests.ps1 b/test/powershell/Host/Logging.Tests.ps1
@@ -155,7 +155,7 @@ Describe 'Basic SysLog tests on Linux' -Tag @('CI','RequireSudoOnUnix') {
                 Write-Warning -Message 'Unsupported Linux syslog configuration.'
                 $IsSupportedEnvironment = $false
             }
-            [string] $powershell = Join-Path -Path $PSHome -ChildPath 'pwsh'
+            [string] $powershell = Join-Path -Path $PSHOME -ChildPath 'pwsh'
             $scriptBlockCreatedRegExTemplate = @"
 Creating Scriptblock text \(1 of 1\):#012{0}(⏎|#012)*ScriptBlock ID: [0-9a-z\-]*#012Path:.*
 "@
@@ -273,7 +273,7 @@ Describe 'Basic os_log tests on MacOS' -Tag @('CI','RequireSudoOnUnix') {
                 Set-OsLogPersistence -Enable
             }
         }
-        [string] $powershell = Join-Path -Path $PSHome -ChildPath 'pwsh'
+        [string] $powershell = Join-Path -Path $PSHOME -ChildPath 'pwsh'
         $scriptBlockCreatedRegExTemplate = @'
 Creating Scriptblock text \(1 of 1\):
 {0}
@@ -436,7 +436,7 @@ $PID
 Describe 'Basic EventLog tests on Windows' -Tag @('CI','RequireAdminOnWindows') {
     BeforeAll {
         [bool] $IsSupportedEnvironment = $IsWindows
-        [string] $powershell = Join-Path -Path $PSHome -ChildPath 'pwsh'
+        [string] $powershell = Join-Path -Path $PSHOME -ChildPath 'pwsh'
         $scriptBlockLoggingCases = @(
             @{
                 name = 'normal script block'
@@ -452,7 +452,7 @@ Describe 'Basic EventLog tests on Windows' -Tag @('CI','RequireAdminOnWindows')
 
         if ($IsSupportedEnvironment)
         {
-            & "$PSHome\RegisterManifest.ps1"
+            & "$PSHOME\RegisterManifest.ps1"
         }
     }
 
diff --git a/test/powershell/Host/PSVersionTable.Tests.ps1 b/test/powershell/Host/PSVersionTable.Tests.ps1
@@ -3,7 +3,7 @@
 Describe "PSVersionTable" -Tags "CI" {
 
     BeforeAll {
-        $sma = Get-Item (Join-Path $PSHome "System.Management.Automation.dll")
+        $sma = Get-Item (Join-Path $PSHOME "System.Management.Automation.dll")
         $formattedVersion = $sma.VersionInfo.ProductVersion
 
         $mainVersionPattern = "(\d+\.\d+\.\d+)(-.+)?"
diff --git a/test/powershell/Host/Read-Host.Tests.ps1 b/test/powershell/Host/Read-Host.Tests.ps1
@@ -3,7 +3,7 @@
 Describe "Read-Host" -Tags "Slow","Feature" {
     Context "[Console]::ReadKey() implementation on non-Windows" {
         BeforeAll {
-            $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+            $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
             $assetsDir = Join-Path -Path $PSScriptRoot -ChildPath assets
             if ($IsWindows) {
                 $ItArgs = @{ skip = $true }
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -697,8 +697,8 @@ Describe "TabCompletion" -Tags CI {
                 @{ inputStr = '$PSMod'; expected = '$PSModuleAutoLoadingPreference'; setup = $null }
                 ## tab completion for variable in path
                 ## if $PSHOME contains a space tabcompletion adds ' around the path
-                @{ inputStr = 'cd $pshome\Modu'; expected = if($PSHOME.Contains(' ')) { "'$(Join-Path $PSHOME 'Modules')'" } else { Join-Path $PSHOME 'Modules' }; setup = $null }
-                @{ inputStr = 'cd "$pshome\Modu"'; expected = "`"$(Join-Path $PSHOME 'Modules')`""; setup = $null }
+                @{ inputStr = 'cd $PSHOME\Modu'; expected = if($PSHOME.Contains(' ')) { "'$(Join-Path $PSHOME 'Modules')'" } else { Join-Path $PSHOME 'Modules' }; setup = $null }
+                @{ inputStr = 'cd "$PSHOME\Modu"'; expected = "`"$(Join-Path $PSHOME 'Modules')`""; setup = $null }
                 @{ inputStr = '$PSHOME\System.Management.Au'; expected = if($PSHOME.Contains(' ')) { "`& '$(Join-Path $PSHOME 'System.Management.Automation.dll')'" }  else { Join-Path $PSHOME 'System.Management.Automation.dll'; setup = $null }}
                 @{ inputStr = '"$PSHOME\System.Management.Au"'; expected = "`"$(Join-Path $PSHOME 'System.Management.Automation.dll')`""; setup = $null }
                 @{ inputStr = '& "$PSHOME\System.Management.Au"'; expected = "`"$(Join-Path $PSHOME 'System.Management.Automation.dll')`""; setup = $null }
diff --git a/test/powershell/Language/Operators/TernaryOperator.Tests.ps1 b/test/powershell/Language/Operators/TernaryOperator.Tests.ps1
@@ -88,15 +88,15 @@ Describe "Using of ternary operator" -Tags CI {
 
     It "Tab completion for variables assigned with ternary expression should work as expected" {
         ## Type inference for the ternary expression should aggregate the inferred values from both branches
-        $text1 = '$var1 = $IsCoreCLR ? (Get-Item $PSHome) : (Get-Process -Id $PID); $var1.Full'
+        $text1 = '$var1 = $IsCoreCLR ? (Get-Item $PSHOME) : (Get-Process -Id $PID); $var1.Full'
         $result = TabExpansion2 -inputScript $text1 -cursorColumn $text1.Length
         $result.CompletionMatches[0].CompletionText | Should -BeExactly FullName
 
-        $text2 = '$var1 = $IsCoreCLR ? (Get-Item $PSHome) : (Get-Process -Id $PID); $var1.Proce'
+        $text2 = '$var1 = $IsCoreCLR ? (Get-Item $PSHOME) : (Get-Process -Id $PID); $var1.Proce'
         $result = TabExpansion2 -inputScript $text2 -cursorColumn $text2.Length
         $result.CompletionMatches[0].CompletionText | Should -BeExactly ProcessName
 
-        $text3 = '$IsCoreCLR ? ($var2 = Get-Item $PSHome) : "blah"; $var2.Full'
+        $text3 = '$IsCoreCLR ? ($var2 = Get-Item $PSHOME) : "blah"; $var2.Full'
         $result = TabExpansion2 -inputScript $text3 -cursorColumn $text3.Length
         $result.CompletionMatches[0].CompletionText | Should -BeExactly FullName
     }
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeCommandProcessor.Tests.ps1
@@ -10,7 +10,7 @@ Describe 'Native pipeline should have proper encoding' -tags 'CI' {
 Describe 'native commands with pipeline' -tags 'Feature' {
 
     BeforeAll {
-        $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+        $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
     }
 
     It "native | ps | native doesn't block" {
diff --git a/test/powershell/Language/Scripting/NativeExecution/NativeStreams.Tests.ps1 b/test/powershell/Language/Scripting/NativeExecution/NativeStreams.Tests.ps1
@@ -2,7 +2,7 @@
 # Licensed under the MIT License.
 Describe "Native streams behavior with PowerShell" -Tags 'CI' {
     BeforeAll {
-        $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+        $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
     }
 
     Context "Error stream" {
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1
@@ -502,7 +502,7 @@ Describe "PSModulePath changes interacting with other PowerShell processes" -Tag
             Restore-ModulePath
         }
 
-        It "Allows Windows PowerShell subprocesses to call `$PSHome modules still" {
+        It "Allows Windows PowerShell subprocesses to call `$PSHOME modules still" {
             $errors = powershell.exe -Command "Get-ChildItem" 2>&1 | Where-Object { $_ -is [System.Management.Automation.ErrorRecord] }
             $errors | Should -Be $null
         }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Enter-PSHostProcess.Tests.ps1
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
 
-$powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+$powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
 
 function Wait-JobPid {
     param (
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/PSSessionConfiguration.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/PSSessionConfiguration.Tests.ps1
@@ -700,7 +700,7 @@ namespace PowershellTestConfigNamespace
                     FunctionDefinitions=@(
                         @{
                             Name = "sysmodules";
-                            ScriptBlock = 'pushd $pshome\Modules';
+                            ScriptBlock = 'pushd $PSHOME\Modules';
                             Options = "AllScope";
                         },
                         @{
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/Remove-Module.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/Remove-Module.Tests.ps1
@@ -329,7 +329,7 @@ Describe "Remove-Module : module is readOnly | Constant" -Tags "CI" {
 Describe "Remove-Module : module provides the PSDrive for current PS Session" -Tags "CI" {
     It "Remove-Module : module provides the PSDrive for current PS Session" {
 
-        $module = Get-Module (Join-Path $PSHome "System.Management.Automation.dll") -ListAvailable
+        $module = Get-Module (Join-Path $PSHOME "System.Management.Automation.dll") -ListAvailable
         { Remove-Module $module -ErrorAction Stop } | Should -Throw -ErrorId "InvalidOperation,Microsoft.PowerShell.Commands.RemoveModuleCommand"
     }
 }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/ExecutionPolicy.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/ExecutionPolicy.Tests.ps1
@@ -100,8 +100,8 @@ try {
                 $LocalSignatureCorruptedScript = Join-Path -Path $remoteTestDirectory -ChildPath LocalSignatureCorruptedScript.ps1
                 $LocalSignedScript = Join-Path -Path $remoteTestDirectory -ChildPath LocalSignedScript.ps1
                 $LocalUnsignedScript = Join-Path -Path $remoteTestDirectory -ChildPath LocalUnsignedScript.ps1
-                $PSHomeUnsignedModule = Join-Path -Path $PSHome -ChildPath 'Modules' -AdditionalChildPath 'LocalUnsignedModule', 'LocalUnsignedModule.psm1'
-                $PSHomeUntrustedModule = Join-Path -Path $PSHome -ChildPath 'Modules' -AdditionalChildPath 'LocalUntrustedModule', 'LocalUntrustedModule.psm1'
+                $PSHomeUnsignedModule = Join-Path -Path $PSHOME -ChildPath 'Modules' -AdditionalChildPath 'LocalUnsignedModule', 'LocalUnsignedModule.psm1'
+                $PSHomeUntrustedModule = Join-Path -Path $PSHOME -ChildPath 'Modules' -AdditionalChildPath 'LocalUntrustedModule', 'LocalUntrustedModule.psm1'
                 $TrustedSignatureCorruptedScript = Join-Path -Path $remoteTestDirectory -ChildPath TrustedSignatureCorruptedScript.ps1
                 $TrustedSignedScript = Join-Path -Path $remoteTestDirectory -ChildPath TrustedSignedScript.ps1
                 $TrustedUnsignedScript = Join-Path -Path $remoteTestDirectory -ChildPath TrustedUnsignedScript.ps1
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-FileHash.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Get-FileHash.Tests.ps1
@@ -24,7 +24,7 @@ Describe "Get-FileHash" -Tags "CI" {
         }
 
         It "Should write non-terminating error if argument is a folder" {
-            $result = $pshome, "${pshome}\pwsh.dll" | Get-FileHash -ErrorVariable errorVariable
+            $result = $PSHOME, "${pshome}\pwsh.dll" | Get-FileHash -ErrorVariable errorVariable
             $result.Count | Should -Be 1
             $errorVariable.FullyQualifiedErrorId | Should -BeExactly "UnauthorizedAccessError,Microsoft.PowerShell.Commands.GetFileHashCommand"
         }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-PSBreakpoint.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Set-PSBreakpoint.Tests.ps1
@@ -1,6 +1,6 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License.
-$ps = Join-Path -Path $PsHome -ChildPath "pwsh"
+$ps = Join-Path -Path $PSHOME -ChildPath "pwsh"
 
 Describe "Set-PSBreakpoint DRT Unit Tests" -Tags "CI" {
     #Set up
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Host.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Write-Host.Tests.ps1
@@ -3,7 +3,7 @@
 Describe "Write-Host with default Console Host" -Tags "Slow","Feature" {
 
     BeforeAll {
-        $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+        $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
 
         $testData = @(
             @{ Name = '-Separator';       Command = "Write-Host a,b,c -Separator '+'";                 returnCount = 1; returnValue = @("a+b+c") }
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/XMLCommand.Tests.ps1
@@ -106,7 +106,7 @@ Describe "XmlCommand DRT basic functionality Tests" -Tags "CI" {
 
 	It "Import-Clixml should work with XML serialization from pwsh.exe" {
 		# need to create separate process so that current powershell doesn't interpret clixml output
-		Start-Process -FilePath $pshome\pwsh -RedirectStandardOutput $testfile -Args "-noprofile -nologo -outputformat xml -command get-command import-clixml" -Wait
+		Start-Process -FilePath $PSHOME\pwsh -RedirectStandardOutput $testfile -Args "-noprofile -nologo -outputformat xml -command get-command import-clixml" -Wait
 		$out = Import-Clixml -Path $testfile
 		$out.Name | Should -Be "Import-CliXml"
 		$out.CommandType.ToString() | Should -Be "Cmdlet"
diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/string.tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/string.tests.ps1
@@ -69,11 +69,11 @@ Describe "String cmdlets" -Tags "CI" {
         It "match object supports RelativePath method" {
             $file = "Modules${sep}Microsoft.PowerShell.Utility${sep}Microsoft.PowerShell.Utility.psd1"
 
-            $match = Select-String CmdletsToExport $pshome/$file
+            $match = Select-String CmdletsToExport $PSHOME/$file
 
-            $match.RelativePath($pshome) | Should -Be $file
-            $match.RelativePath($pshome.ToLower()) | Should -Be $file
-            $match.RelativePath($pshome.ToUpper()) | Should -Be $file
+            $match.RelativePath($PSHOME) | Should -Be $file
+            $match.RelativePath($PSHOME.ToLower()) | Should -Be $file
+            $match.RelativePath($PSHOME.ToUpper()) | Should -Be $file
         }
     }
 }
diff --git a/test/powershell/Provider/Pester.AutomountedDrives.Tests.ps1 b/test/powershell/Provider/Pester.AutomountedDrives.Tests.ps1
@@ -9,7 +9,7 @@ $script:TestSourceRoot = $PSScriptRoot
 Describe "Test suite for validating automounted PowerShell drives" -Tags @('Feature', 'Slow', 'RequireAdminOnWindows') {
 
     BeforeAll {
-        $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+        $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
 
         $AutomountVHDDriveScriptPath = Join-Path $script:TestSourceRoot 'AutomountVHDDrive.ps1'
         $vhdPath = Join-Path $TestDrive 'TestAutomountVHD.vhd'
diff --git a/test/powershell/SDK/PSDebugging.Tests.ps1 b/test/powershell/SDK/PSDebugging.Tests.ps1
@@ -6,7 +6,7 @@ using namespace System.Management.Automation.Internal
 Describe "PowerShell Command Debugging" -tags "CI" {
 
     BeforeAll {
-        $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
+        $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"
     }
 
     function NewProcessStartInfo([string]$CommandLine, [switch]$RedirectStdIn)
diff --git a/test/powershell/engine/Help/HelpSystem.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.Tests.ps1
@@ -217,7 +217,7 @@ Describe "Validate that get-help works for provider specific help" -Tags @('CI')
 
 Describe "Validate about_help.txt under culture specific folder works" -Tags @('CI', 'RequireAdminOnWindows', 'RequireSudoOnUnix') {
     BeforeAll {
-        $modulePath = "$pshome\Modules\Test"
+        $modulePath = "$PSHOME\Modules\Test"
         if (Test-CanWriteToPsHome) {
             $null = New-Item -Path $modulePath\en-US -ItemType Directory -Force
             New-ModuleManifest -Path $modulePath\test.psd1 -RootModule test.psm1
@@ -241,7 +241,7 @@ Describe "Validate about_help.txt under culture specific folder works" -Tags @('
         Get-ChildItem -Path $aboutHelpPath -Include @('about_*.txt', "*help.xml") -Recurse | Remove-Item -Force -ErrorAction SilentlyContinue
     }
 
-    It "Get-Help should return help text and not multiple HelpInfo objects when help is under `$pshome path" -Skip:(!(Test-CanWriteToPsHome)) {
+    It "Get-Help should return help text and not multiple HelpInfo objects when help is under `$PSHOME path" -Skip:(!(Test-CanWriteToPsHome)) {
 
         $help = Get-Help about_testhelp
         $help.count | Should -Be 1
diff --git a/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1 b/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1
diff --git a/test/powershell/engine/Module/TestModuleManifest.Tests.ps1 b/test/powershell/engine/Module/TestModuleManifest.Tests.ps1
diff --git a/test/tools/Modules/HelpersCommon/HelpersCommon.psm1 b/test/tools/Modules/HelpersCommon/HelpersCommon.psm1
diff --git a/tools/install-powershell.ps1 b/tools/install-powershell.ps1
diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1

Original file line number	Diff line number	Diff line change
`@@ -172,17 +172,17 @@ function Enable-PSWSManCombinedTrace`
`172`	`172`	`$traceFileName = [string][Guid]::NewGuid()`
`173`	`173`	`if ($DoNotOverwriteExistingTrace) {`
`174`	`174`	`$fileName = [string][guid]::newguid()`
`175`		`- $logfile = $pshome + "\\Traces\\PSTrace_$fileName.etl"`
	`175`	`+ $logfile = $PSHOME + "\\Traces\\PSTrace_$fileName.etl"`
`176`	`176`	`} else {`
`177`		`- $logfile = $pshome + "\\Traces\\PSTrace.etl"`
	`177`	`+ $logfile = $PSHOME + "\\Traces\\PSTrace.etl"`
`178`	`178`	`}`
`179`	`179`
`180`	`180`	`"Microsoft-Windows-PowerShell 0 5" \| out-file $provfile -encoding ascii`
`181`	`181`	`"Microsoft-Windows-WinRM 0 5" \| out-file $provfile -encoding ascii -append`
`182`	`182`
`183`		`- if (!(Test-Path $pshome\Traces))`
	`183`	`+ if (!(Test-Path $PSHOME\Traces))`
`184`	`184`	`{`
`185`		`- New-Item -ItemType Directory -Force $pshome\Traces \| out-null`
	`185`	`+ New-Item -ItemType Directory -Force $PSHOME\Traces \| out-null`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`if (Test-Path $logfile)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`Describe "Configuration file locations" -tags "CI","Slow" {`
`4`	`4`
`5`	`5`	`BeforeAll {`
`6`		`- $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"`
	`6`	`+ $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"`
`7`	`7`	`$profileName = "Microsoft.PowerShell_profile.ps1"`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ Describe 'Basic SysLog tests on Linux' -Tag @('CI','RequireSudoOnUnix') {`
`155`	`155`	`Write-Warning -Message 'Unsupported Linux syslog configuration.'`
`156`	`156`	`$IsSupportedEnvironment = $false`
`157`	`157`	`}`
`158`		`- [string] $powershell = Join-Path -Path $PSHome -ChildPath 'pwsh'`
	`158`	`+ [string] $powershell = Join-Path -Path $PSHOME -ChildPath 'pwsh'`
`159`	`159`	`$scriptBlockCreatedRegExTemplate = @"`
`160`	`160`	`Creating Scriptblock text \(1 of 1\):#012{0}(⏎\|#012)ScriptBlock ID: [0-9a-z\-]#012Path:.*`
`161`	`161`	`"@`
`@@ -273,7 +273,7 @@ Describe 'Basic os_log tests on MacOS' -Tag @('CI','RequireSudoOnUnix') {`
`273`	`273`	`Set-OsLogPersistence -Enable`
`274`	`274`	`}`
`275`	`275`	`}`
`276`		`- [string] $powershell = Join-Path -Path $PSHome -ChildPath 'pwsh'`
	`276`	`+ [string] $powershell = Join-Path -Path $PSHOME -ChildPath 'pwsh'`
`277`	`277`	`$scriptBlockCreatedRegExTemplate = @'`
`278`	`278`	`Creating Scriptblock text \(1 of 1\):`
`279`	`279`	`{0}`
`@@ -436,7 +436,7 @@ $PID`
`436`	`436`	`Describe 'Basic EventLog tests on Windows' -Tag @('CI','RequireAdminOnWindows') {`
`437`	`437`	`BeforeAll {`
`438`	`438`	`[bool] $IsSupportedEnvironment = $IsWindows`
`439`		`- [string] $powershell = Join-Path -Path $PSHome -ChildPath 'pwsh'`
	`439`	`+ [string] $powershell = Join-Path -Path $PSHOME -ChildPath 'pwsh'`
`440`	`440`	`$scriptBlockLoggingCases = @(`
`441`	`441`	`@{`
`442`	`442`	`name = 'normal script block'`
`@@ -452,7 +452,7 @@ Describe 'Basic EventLog tests on Windows' -Tag @('CI','RequireAdminOnWindows')`
`452`	`452`
`453`	`453`	`if ($IsSupportedEnvironment)`
`454`	`454`	`{`
`455`		`- & "$PSHome\RegisterManifest.ps1"`
	`455`	`+ & "$PSHOME\RegisterManifest.ps1"`
`456`	`456`	`}`
`457`	`457`	`}`
`458`	`458`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ Describe 'Native pipeline should have proper encoding' -tags 'CI' {`
`10`	`10`	`Describe 'native commands with pipeline' -tags 'Feature' {`
`11`	`11`
`12`	`12`	`BeforeAll {`
`13`		`- $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"`
	`13`	`+ $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`It "native \| ps \| native doesn't block" {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`# Licensed under the MIT License.`
`3`	`3`	`Describe "Native streams behavior with PowerShell" -Tags 'CI' {`
`4`	`4`	`BeforeAll {`
`5`		`- $powershell = Join-Path -Path $PsHome -ChildPath "pwsh"`
	`5`	`+ $powershell = Join-Path -Path $PSHOME -ChildPath "pwsh"`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`Context "Error stream" {`