admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename powershell.exe to pwsh.exe (#5101)

Browse Source 
- Rename powershell.exe to pwsh.exe
- Fixe appveyor.psm1
- Update MSI to include 'pwsh' in path and app paths
- Revert change for hyper-v powershell direct
- Update names in packaging.psm1.
- Fix check for SxS
This commit is contained in:
Steve Lee
2017-10-17 17:25:11 -07:00
committed by Dongbo Wang
parent 17731cf6e9
commit 2cc091115b
51 changed files with 146 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/powershell/engine/Module/ModulePath.Tests.ps1
+5 -5
View File
@@ -4,7 +4,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
if ($IsWindows)
{
$powershell = "$PSHOME\powershell.exe"
$powershell = "$PSHOME\pwsh.exe"
$ProductName = "WindowsPowerShell"
if ($IsCoreCLR -and ($PSHOME -notlike "*Windows\System32\WindowsPowerShell\v1.0"))
{
@@ -15,7 +15,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
}
else
{
$powershell = "$PSHOME/powershell"
$powershell = "$PSHOME/pwsh"
$expectedUserPath = [System.Management.Automation.Platform]::SelectProductNameForDirectory("USER_MODULES")
$expectedSharedPath = [System.Management.Automation.Platform]::SelectProductNameForDirectory("SHARED_MODULES")
}
@@ -25,7 +25,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
$fakePSHome = Join-Path -Path $TestDrive -ChildPath 'FakePSHome'
$fakePSHomeModuleDir = Join-Path -Path $fakePSHome -ChildPath 'Modules'
$fakePowerShell = Join-Path -Path $fakePSHome -ChildPath (Split-Path -Path $powershell -Leaf)
$fakePSDepsFile = Join-Path -Path $fakePSHome -ChildPath "powershell.deps.json"
$fakePSDepsFile = Join-Path -Path $fakePSHome -ChildPath "pwsh.deps.json"
New-Item -Path $fakePSHome -ItemType Directory > $null
New-Item -Path $fakePSHomeModuleDir -ItemType Directory > $null
@@ -56,7 +56,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
It "ignore pshome module path derived from a different powershell core instance" -Skip:(!$IsCoreCLR) {
## Create 'powershell' and 'powershell.deps.json' in the fake PSHome folder,
## Create 'powershell' and 'pwsh.deps.json' in the fake PSHome folder,
## so that the module path calculation logic would believe it's real.
New-Item -Path $fakePowerShell -ItemType File -Force > $null
New-Item -Path $fakePSDepsFile -ItemType File -Force > $null
@@ -75,7 +75,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
} finally {
## Remove 'powershell' and 'powershell.deps.json' from the fake PSHome folder
## Remove 'powershell' and 'pwsh.deps.json' from the fake PSHome folder
Remove-Item -Path $fakePowerShell -Force -ErrorAction SilentlyContinue
Remove-Item -Path $fakePSDepsFile -Force -ErrorAction SilentlyContinue
}