From a96b4c040492e4e8f79ba243af6d43206fcd8791 Mon Sep 17 00:00:00 2001 From: Steve Lee Date: Fri, 10 May 2019 15:34:27 -0700 Subject: [PATCH] Update use of "PowerShell Core" to just "PowerShell" (#9513) --- PowerShell.Common.props | 2 +- assets/AppxManifest.xml | 12 ++-- assets/pwsh.manifest | 12 ++-- build.psm1 | 8 +-- ...anagement.Infrastructure.CimCmdlets.csproj | 2 +- .../ExportCounterCommand.cs | 2 +- .../GetCounterCommand.cs | 2 +- .../ImportCounterCommand.cs | 2 +- ...oft.PowerShell.Commands.Diagnostics.csproj | 2 +- ...soft.PowerShell.Commands.Management.csproj | 2 +- ...crosoft.PowerShell.Commands.Utility.csproj | 2 +- .../commands/utility/AddType.cs | 4 +- .../resources/NewObjectStrings.resx | 2 +- ...crosoft.PowerShell.CoreCLR.Eventing.csproj | 2 +- .../GlobalToolShim.cs | 2 +- .../Microsoft.PowerShell.LocalAccounts.csproj | 2 +- ...Microsoft.PowerShell.MarkdownRender.csproj | 2 +- .../Microsoft.PowerShell.Security.csproj | 4 +- .../Microsoft.WSMan.Management.csproj | 2 +- .../Microsoft.WSMan.Runtime.csproj | 2 +- .../PowerShell.Core.Instrumentation.man | 2 +- .../CoreCLR/CorePsAssemblyLoadContext.cs | 4 +- .../System.Management.Automation.csproj | 2 +- .../engine/Modules/ModuleCmdletBase.cs | 2 +- .../engine/Modules/ModuleIntrinsics.cs | 2 +- .../engine/Modules/PSModuleInfo.cs | 2 +- .../engine/UserFeedbackParameters.cs | 2 +- .../remoting/client/ClientRemotePowerShell.cs | 2 +- .../remoting/commands/CustomShellCommands.cs | 20 +++--- .../remoting/common/RunspaceConnectionInfo.cs | 2 +- .../resources/Modules.resx | 2 +- .../resources/ParserStrings.resx | 6 +- .../resources/RemotingErrorIdStrings.resx | 62 +++++++++---------- .../utils/ClrFacade.cs | 4 +- .../powershell-win-core.csproj | 2 +- test/Test.Common.props | 4 +- .../networktest/DockerRemoting.Tests.ps1 | 12 ++-- test/packaging/windows/msi.tests.ps1 | 4 +- test/powershell/Host/ConsoleHost.Tests.ps1 | 2 +- .../CompatiblePSEditions.Module.Tests.ps1 | 2 +- .../Start-Process.Tests.ps1 | 4 +- .../FileCatalog.Tests.ps1 | 2 +- .../certificateCommon.psm1 | 2 +- .../Implicit.Remoting.Tests.ps1 | 2 +- .../engine/Basic/PropertyAccessor.Tests.ps1 | 2 +- .../Help/HelpSystem.OnlineHelp.Tests.ps1 | 2 +- .../engine/Help/UpdatableHelpSystem.Tests.ps1 | 24 +++---- .../engine/Module/ModulePath.Tests.ps1 | 8 +-- .../Module/TestModuleManifest.Tests.ps1 | 2 +- tools/install-powershell.ps1 | 14 ++--- tools/install-powershell.sh | 10 +-- tools/installpsh-amazonlinux.sh | 14 ++--- tools/installpsh-debian.sh | 12 ++-- tools/installpsh-osx.sh | 10 +-- tools/installpsh-redhat.sh | 12 ++-- tools/installpsh-suse.sh | 18 +++--- tools/packaging/packaging.strings.psd1 | 4 +- tools/packaging/projects/nuget/package.csproj | 4 +- .../projects/nuget/powershell.nuspec | 4 +- tools/windows/Reset-PWSHSystemPath.ps1 | 14 ++--- 60 files changed, 187 insertions(+), 187 deletions(-) diff --git a/PowerShell.Common.props b/PowerShell.Common.props index 42656d777e..81224a9a87 100644 --- a/PowerShell.Common.props +++ b/PowerShell.Common.props @@ -89,7 +89,7 @@ - PowerShell Core + PowerShell Microsoft Corporation (c) Microsoft Corporation. All rights reserved. diff --git a/assets/AppxManifest.xml b/assets/AppxManifest.xml index 586562ac6b..d24bfd4a7e 100644 --- a/assets/AppxManifest.xml +++ b/assets/AppxManifest.xml @@ -1,10 +1,10 @@  @@ -12,7 +12,7 @@ - PowerShell Core 6 + PowerShell 7 Microsoft Corporation assets\StoreLogo.png disabled @@ -36,7 +36,7 @@ - + diff --git a/assets/pwsh.manifest b/assets/pwsh.manifest index 3584aba51b..428ea91436 100644 --- a/assets/pwsh.manifest +++ b/assets/pwsh.manifest @@ -1,19 +1,19 @@ - PowerShell Core 6 + PowerShell 7 + /> - - - + + + @@ -21,6 +21,6 @@ - + diff --git a/build.psm1 b/build.psm1 index 2169e4c8a7..3a318614b2 100644 --- a/build.psm1 +++ b/build.psm1 @@ -100,7 +100,7 @@ function Get-PSCommitId function Get-EnvironmentInformation { $environment = @{} - # PowerShell Core will likely not be built on pre-1709 nanoserver + # PowerShell will likely not be built on pre-1709 nanoserver if ($PSVersionTable.ContainsKey("PSEdition") -and "Core" -eq $PSVersionTable.PSEdition) { $environment += @{'IsCoreCLR' = $true} $environment += @{'IsLinux' = $IsLinux} @@ -488,7 +488,7 @@ Fix steps: # fxdependent package does not have an executable to set iconPath etc. if ($Options.Runtime -ne 'fxdependent') { Start-NativeExecution { & $rcedit $pwshPath --set-icon $iconPath ` - --set-file-version $fileVersion --set-product-version $ReleaseVersion --set-version-string "ProductName" "PowerShell Core 6" ` + --set-file-version $fileVersion --set-product-version $ReleaseVersion --set-version-string "ProductName" "PowerShell 7" ` --set-version-string "LegalCopyright" "(C) Microsoft Corporation. All Rights Reserved." ` --application-manifest "$PSScriptRoot\assets\pwsh.manifest" } | Write-Verbose } @@ -919,7 +919,7 @@ function Start-PSPester { [switch]$IncludeCommonTests, [string]$ExperimentalFeatureName, [Parameter(HelpMessage='Title to publish the results as.')] - [string]$Title = 'PowerShell Core Tests', + [string]$Title = 'PowerShell 7 Tests', [Parameter(ParameterSetName='Wait', Mandatory=$true, HelpMessage='Wait for the debugger to attach to PowerShell before Pester starts. Debug builds only!')] [switch]$Wait, @@ -1737,7 +1737,7 @@ function Start-PSBootstrap { ## The VSCode build task requires 'pwsh.exe' to be found in Path if (-not (Get-Command -Name pwsh.exe -CommandType Application -ErrorAction Ignore)) { - Write-Log "pwsh.exe not found. Install latest PowerShell Core release and add it to Path" + Write-Log "pwsh.exe not found. Install latest PowerShell release and add it to Path" $psInstallFile = [System.IO.Path]::Combine($PSScriptRoot, "tools", "install-powershell.ps1") & $psInstallFile -AddToPath } diff --git a/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj b/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj index 4bd6bba5d9..95516295d7 100644 --- a/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj +++ b/src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj @@ -1,7 +1,7 @@  - PowerShell Core's Microsoft.Management.Infrastructure.CimCmdlets project + PowerShell's Microsoft.Management.Infrastructure.CimCmdlets project $(NoWarn);CS1570;CS1572;CS1573;CS1574;CS1584;CS1587;CS1591 Microsoft.Management.Infrastructure.CimCmdlets diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/ExportCounterCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/ExportCounterCommand.cs index 7a8b1ad76d..fc0183466a 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/ExportCounterCommand.cs +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/ExportCounterCommand.cs @@ -162,7 +162,7 @@ namespace Microsoft.PowerShell.Commands throw new PlatformNotSupportedException(); } - // PowerShell Core requires at least Windows 7, + // PowerShell 7 requires at least Windows 7, // so no version test is needed _pdhHelper = new PdhHelper(false); #else diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs index 873d0b9bb6..0889cdc7f4 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs @@ -218,7 +218,7 @@ namespace Microsoft.PowerShell.Commands throw new PlatformNotSupportedException(); } - // PowerShell Core requires at least Windows 7, + // PowerShell 7 requires at least Windows 7, // so no version test is needed _pdhHelper = new PdhHelper(false); #else diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs b/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs index e113093979..fc08bcd96c 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs @@ -201,7 +201,7 @@ namespace Microsoft.PowerShell.Commands throw new PlatformNotSupportedException(); } - // PowerShell Core requires at least Windows 7, + // PowerShell 7 requires at least Windows 7, // so no version test is needed _pdhHelper = new PdhHelper(false); #else diff --git a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj index a199fa7991..f69a49c55b 100644 --- a/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj +++ b/src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj @@ -1,7 +1,7 @@  - PowerShell Core's Microsoft.PowerShell.Commands.Diagnostics project + PowerShell's Microsoft.PowerShell.Commands.Diagnostics project $(NoWarn);CS1591 Microsoft.PowerShell.Commands.Diagnostics diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj index ccb3c17da7..67503da2cf 100644 --- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj +++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj @@ -1,7 +1,7 @@  - PowerShell Core's Microsoft.PowerShell.Commands.Management project + PowerShell's Microsoft.PowerShell.Commands.Management project $(NoWarn);CS1570 Microsoft.PowerShell.Commands.Management diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index 2e52b3d742..fce2879989 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -1,7 +1,7 @@  - PowerShell Core's Microsoft.PowerShell.Commands.Utility project + PowerShell's Microsoft.PowerShell.Commands.Utility project $(NoWarn);CS1570 Microsoft.PowerShell.Commands.Utility diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs index 2044a3bde4..7966e8b8a3 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs +++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs @@ -605,7 +605,7 @@ namespace Microsoft.PowerShell.Commands #region LoadAssembly - // We now ship .Net Core's reference assemblies with PowerShell Core, so that Add-Type can work + // We now ship .Net Core's reference assemblies with PowerShell, so that Add-Type can work // in a predictable way and won't be broken when we move to newer version of .NET Core. // The reference assemblies are located at '$PSHOME\ref'. private static readonly string s_netcoreAppRefFolder = PathType.Combine(PathType.GetDirectoryName(typeof(PSObject).Assembly.Location), "ref"); @@ -756,7 +756,7 @@ namespace Microsoft.PowerShell.Commands // We look up in reference/framework only when it's for resolving reference assemblies. // In case of 'Add-Type -AssemblyName' scenario, we don't attempt to resolve against framework assemblies because - // 1. Explicitly loading a framework assembly usually is not necessary in PowerShell Core. + // 1. Explicitly loading a framework assembly usually is not necessary in PowerShell 6+. // 2. A user should use assembly name instead of path if they want to explicitly load a framework assembly. if (isForReferenceAssembly) { diff --git a/src/Microsoft.PowerShell.Commands.Utility/resources/NewObjectStrings.resx b/src/Microsoft.PowerShell.Commands.Utility/resources/NewObjectStrings.resx index a435ee62db..63b4271c38 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/resources/NewObjectStrings.resx +++ b/src/Microsoft.PowerShell.Commands.Utility/resources/NewObjectStrings.resx @@ -145,6 +145,6 @@ Cannot create type. Only core types are supported in this language mode. - {0} Please note that Single-Threaded Apartment is not supported in PowerShell Core. + {0} Please note that Single-Threaded Apartment is not supported in PowerShell. diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj index 740e247029..7bdd81b6ff 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj @@ -1,7 +1,7 @@  - PowerShell Core's Microsoft.PowerShell.CoreCLR.Eventing project + PowerShell's Microsoft.PowerShell.CoreCLR.Eventing project $(NoWarn);CS1591 Microsoft.PowerShell.CoreCLR.Eventing diff --git a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs index 6ea137fa05..5f51e0644d 100644 --- a/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs +++ b/src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs @@ -8,7 +8,7 @@ using System.Runtime.InteropServices; namespace Microsoft.PowerShell.GlobalTool.Shim { /// - /// Shim layer to chose the appropriate runtime for PowerShell Core DotNet Global tool. + /// Shim layer to chose the appropriate runtime for PowerShell DotNet Global tool. /// public class EntryPoint { diff --git a/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj b/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj index 7ee2b9dfbc..6685957fae 100644 --- a/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj +++ b/src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj @@ -3,7 +3,7 @@ - PowerShell Core's Microsoft.PowerShell.LocalAccounts project + PowerShell's Microsoft.PowerShell.LocalAccounts project Microsoft.PowerShell.LocalAccounts diff --git a/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj b/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj index fc92082352..c297a0f571 100644 --- a/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj +++ b/src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj @@ -2,7 +2,7 @@ - PowerShell Core's Markdown Rendering project + PowerShell's Markdown Rendering project Microsoft.PowerShell.MarkdownRender diff --git a/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj b/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj index c67d0b1ad7..b6dae104e3 100644 --- a/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj +++ b/src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj @@ -1,7 +1,7 @@  - PowerShell Core's Microsoft.PowerShell.Security project + PowerShell's Microsoft.PowerShell.Security project $(NoWarn);CS1570 Microsoft.PowerShell.Security @@ -16,5 +16,5 @@ - + diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj index 0e93428f72..d4433fd220 100644 --- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj +++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj @@ -1,7 +1,7 @@  - PowerShell Core's Microsoft.WSMan.Management project + PowerShell's Microsoft.WSMan.Management project Microsoft.WSMan.Management diff --git a/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj b/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj index 367ece5c07..7ebc728020 100644 --- a/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj +++ b/src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj @@ -1,7 +1,7 @@  - PowerShell Core's Microsoft.WSMan.Runtime project + PowerShell's Microsoft.WSMan.Runtime project Microsoft.WSMan.Runtime diff --git a/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man b/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man index e0c671ca8a..07cad54ffc 100644 --- a/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man +++ b/src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man @@ -25,7 +25,7 @@ xmlns:xs="http://www.w3.org/2001/XMLSchema" > - @@ -657,7 +657,7 @@ Session configuration "{0}" is not a PowerShell-based shell. - Session configuration "{0}" is a PowerShell Core-based shell. Please use PowerShell Core to modify it. + Session configuration "{0}" is a PowerShell-based shell. Please use PowerShell 6+ to modify it. Session configuration "{0}" is a Windows PowerShell-based shell. Please use Windows PowerShell to modify it. @@ -1659,7 +1659,7 @@ All WinRM sessions connected to PowerShell session configurations, such as Micro The SSH transport process has abruptly terminated causing this remote session to break. - PowerShell Core does not support WOW64. The binary must match the architecture of the processor. + PowerShell 6+ does not support WOW64. The binary must match the architecture of the processor. Unable to install plugin {0} to directory {1}. @@ -1687,10 +1687,10 @@ All WinRM sessions connected to PowerShell session configurations, such as Micro HTTPS on Unix does not currently support CA or CN checks. Use the PSSessionOption -SkipCACheck and -SkipCNCheck if you are certain you trust the server you are connecting to and the network in between. - PowerShell remoting has been disabled only for PowerShell Core configurations and does not affect Windows PowerShell remoting configurations. Run this cmdlet in Windows PowerShell to affect all PowerShell remoting configurations. + PowerShell remoting has been disabled only for PowerShell 6+ configurations and does not affect Windows PowerShell remoting configurations. Run this cmdlet in Windows PowerShell to affect all PowerShell remoting configurations. - PowerShell remoting has been enabled only for PowerShell Core configurations and does not affect Windows PowerShell remoting configurations. Run this cmdlet in Windows PowerShell to affect all PowerShell remoting configurations. + PowerShell remoting has been enabled only for PowerShell 6+ configurations and does not affect Windows PowerShell remoting configurations. Run this cmdlet in Windows PowerShell to affect all PowerShell remoting configurations. diff --git a/src/System.Management.Automation/utils/ClrFacade.cs b/src/System.Management.Automation/utils/ClrFacade.cs index f257485c82..eea0ffb7d7 100644 --- a/src/System.Management.Automation/utils/ClrFacade.cs +++ b/src/System.Management.Automation/utils/ClrFacade.cs @@ -64,13 +64,13 @@ namespace System.Management.Automation } /// - /// Get the namespace-qualified type names of all available .NET Core types shipped with PowerShell Core. + /// Get the namespace-qualified type names of all available .NET Core types shipped with PowerShell. /// This is used for type name auto-completion in PS engine. /// internal static IEnumerable AvailableDotNetTypeNames => PSAssemblyLoadContext.AvailableDotNetTypeNames; /// - /// Get the assembly names of all available .NET Core assemblies shipped with PowerShell Core. + /// Get the assembly names of all available .NET Core assemblies shipped with PowerShell. /// This is used for type name auto-completion in PS engine. /// internal static HashSet AvailableDotNetAssemblyNames => PSAssemblyLoadContext.AvailableDotNetAssemblyNames; diff --git a/src/powershell-win-core/powershell-win-core.csproj b/src/powershell-win-core/powershell-win-core.csproj index 93f3a9446f..aed9a90c8f 100644 --- a/src/powershell-win-core/powershell-win-core.csproj +++ b/src/powershell-win-core/powershell-win-core.csproj @@ -1,7 +1,7 @@  - PowerShell Core on Windows top-level project + PowerShell on Windows top-level project pwsh Exe true diff --git a/test/Test.Common.props b/test/Test.Common.props index 9c102ff956..5a58ed5591 100644 --- a/test/Test.Common.props +++ b/test/Test.Common.props @@ -1,6 +1,6 @@ - PowerShell Core Test + PowerShell Test Microsoft Corporation (c) Microsoft Corporation. All rights reserved. @@ -12,7 +12,7 @@ true true - + $(DefineConstants);UNIX diff --git a/test/docker/networktest/DockerRemoting.Tests.ps1 b/test/docker/networktest/DockerRemoting.Tests.ps1 index 55fd159e6d..392f5819dd 100644 --- a/test/docker/networktest/DockerRemoting.Tests.ps1 +++ b/test/docker/networktest/DockerRemoting.Tests.ps1 @@ -21,12 +21,12 @@ Describe "Basic remoting test with docker" -tags @("Scenario","Slow"){ $client = docker run -d $imageName powershell -c Start-Sleep -Seconds $timeout # get fullpath to installed core powershell - Write-Verbose -verbose "Getting path to PowerShell core" + Write-Verbose -verbose "Getting path to PowerShell" $powershellcorepath = docker exec $server powershell -c "(get-childitem 'c:\program files\powershell\*\pwsh.exe').fullname" if ( ! $powershellcorepath ) { $pending = $true - write-warning "Cannot find powershell core executable, not running tests" + write-warning "Cannot find powershell executable, not running tests" return } $powershellcoreversion = ($powershellcorepath -split "[\\/]")[-2] @@ -49,12 +49,12 @@ Describe "Basic remoting test with docker" -tags @("Scenario","Slow"){ return } - write-verbose -verbose "getting powershell core version" + write-verbose -verbose "getting powershell version" $coreVersion = docker exec $client "$powershellcorepath" -c "`$psversiontable.psversion.tostring()" if ( ! $coreVersion ) { $pending = $true - write-warning "Cannot determine PowerShell core version, not running tests" + write-warning "Cannot determine PowerShell version, not running tests" return } } @@ -67,7 +67,7 @@ Describe "Basic remoting test with docker" -tags @("Scenario","Slow"){ } } - It "Full powershell can get correct remote powershell core version" -pending:$pending { + 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 | should be $coreVersion } @@ -77,7 +77,7 @@ Describe "Basic remoting test with docker" -tags @("Scenario","Slow"){ $result | should be $fullVersion } - It "Core powershell can get correct remote powershell core version" -pending:$pending { + 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 | should be $coreVersion } diff --git a/test/packaging/windows/msi.tests.ps1 b/test/packaging/windows/msi.tests.ps1 index 1a79f4144e..4ffb73a08d 100644 --- a/test/packaging/windows/msi.tests.ps1 +++ b/test/packaging/windows/msi.tests.ps1 @@ -54,7 +54,7 @@ Describe -Name "Windows MSI" -Fixture { BeforeAll { $msiX64Path = $env:PsMsiX64Path - # Get any existing powershell core in the path + # Get any existing powershell in the path $beforePath = @(([System.Environment]::GetEnvironmentVariable('PATH', 'MACHINE')) -split ';' | Where-Object {$_ -like '*files\powershell*'}) @@ -76,7 +76,7 @@ Describe -Name "Windows MSI" -Fixture { 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 + $uploadedLog = $true } } diff --git a/test/powershell/Host/ConsoleHost.Tests.ps1 b/test/powershell/Host/ConsoleHost.Tests.ps1 index 17f91942f7..db2bc8ebaa 100644 --- a/test/powershell/Host/ConsoleHost.Tests.ps1 +++ b/test/powershell/Host/ConsoleHost.Tests.ps1 @@ -826,7 +826,7 @@ Describe "Pwsh exe resources tests" -Tag CI { $pwsh = Get-Item -Path "$PSHOME\pwsh.exe" $pwsh.VersionInfo.FileVersion | Should -BeExactly $PSVersionTable.PSVersion.ToString().Split("-")[0] $pwsh.VersionInfo.ProductVersion.Replace("-dirty","") | Should -BeExactly $PSVersionTable.GitCommitId - $pwsh.VersionInfo.ProductName | Should -BeExactly "PowerShell Core 6" + $pwsh.VersionInfo.ProductName | Should -BeExactly "PowerShell 7" } It "Manifest contains compatibility section" -Skip:(!$IsWindows) { diff --git a/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1 index 767679c82e..73e4c0ce41 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Core/CompatiblePSEditions.Module.Tests.ps1 @@ -348,7 +348,7 @@ Describe "PSModulePath changes interacting with other PowerShell processes" -Tag $errors | Should -Be $null } - It "Allows PowerShell Core 6 subprocesses to call core modules" { + It "Allows PowerShell subprocesses to call core modules" { $errors = pwsh.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.Management/Start-Process.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Management/Start-Process.Tests.ps1 index 6ac3142d72..0910b672dc 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Management/Start-Process.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Management/Start-Process.Tests.ps1 @@ -90,12 +90,12 @@ Describe "Start-Process" -Tag "Feature","RequireAdminOnWindows" { $dirEntry.Length | Should -BeGreaterThan 0 } - ## -Verb is supported in PowerShell core on Windows full desktop. + ## -Verb is supported in PowerShell on Windows full desktop. It "Should give an error when -Verb parameter is used" -Skip:$isFullWin { { Start-Process -Verb runas -FilePath $pingCommand } | Should -Throw -ErrorId "NotSupportedException,Microsoft.PowerShell.Commands.StartProcessCommand" } - ## -WindowStyle is supported in PowerShell core on Windows full desktop. + ## -WindowStyle is supported in PowerShell on Windows full desktop. It "Should give an error when -WindowStyle parameter is used" -Skip:$isFullWin { { Start-Process -FilePath $pingCommand -WindowStyle Normal } | Should -Throw -ErrorId "NotSupportedException,Microsoft.PowerShell.Commands.StartProcessCommand" } diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/FileCatalog.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Security/FileCatalog.Tests.ps1 index 173c3851c6..b86caafe64 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Security/FileCatalog.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Security/FileCatalog.Tests.ps1 @@ -1,7 +1,7 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -# This is a Pester test suite to validate the New-FileCatalog & Test-FileCatalog cmdlets on PowerShell Core. +# This is a Pester test suite to validate the New-FileCatalog & Test-FileCatalog cmdlets on PowerShell. try { #skip all tests on non-windows platform diff --git a/test/powershell/Modules/Microsoft.PowerShell.Security/certificateCommon.psm1 b/test/powershell/Modules/Microsoft.PowerShell.Security/certificateCommon.psm1 index f390082193..e9a9d95a77 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Security/certificateCommon.psm1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Security/certificateCommon.psm1 @@ -143,7 +143,7 @@ function Install-TestCertificates if ($IsCoreCLR -and $IsWindows) { - # PKI module is not available for PowerShell Core, so we need to use Windows PowerShell to import the cert + # PKI module is not available for PowerShell, so we need to use Windows PowerShell to import the cert $fullPowerShell = Join-Path "$env:SystemRoot" "System32\WindowsPowerShell\v1.0\powershell.exe" try { diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/Implicit.Remoting.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/Implicit.Remoting.Tests.ps1 index dca7b063dc..900102db0b 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Utility/Implicit.Remoting.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/Implicit.Remoting.Tests.ps1 @@ -1464,7 +1464,7 @@ try Get-PSSessionConfiguration ImplicitRemotingRestrictedConfiguration* | Unregister-PSSessionConfiguration -Force - ## The 'Register-PSSessionConfiguration' call below raises an AssemblyLoadException in powershell core: + ## The 'Register-PSSessionConfiguration' call below raises an AssemblyLoadException in powershell: ## "Could not load file or assembly 'Microsoft.Powershell.Workflow.ServiceCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'. The system cannot find the file specified." ## Issue #2555 is created to track this issue and all tests here are skipped for CoreCLR for now. diff --git a/test/powershell/engine/Basic/PropertyAccessor.Tests.ps1 b/test/powershell/engine/Basic/PropertyAccessor.Tests.ps1 index 2238166a4a..8242b0c191 100644 --- a/test/powershell/engine/Basic/PropertyAccessor.Tests.ps1 +++ b/test/powershell/engine/Basic/PropertyAccessor.Tests.ps1 @@ -13,7 +13,7 @@ try { #skip all tests on non-windows platform $originalDefaultParameterValues = $PSDefaultParameterValues.Clone() - $IsNotSkipped = ($IsWindows -and !$IsInbox) # Only execute for PowerShell Core on Windows + $IsNotSkipped = ($IsWindows -and !$IsInbox) # Only execute for PowerShell on Windows $PSDefaultParameterValues["it:skip"] = !$IsNotSkipped Describe "User-Specific powershell.config.json Modifications" -Tags "CI" { diff --git a/test/powershell/engine/Help/HelpSystem.OnlineHelp.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.OnlineHelp.Tests.ps1 index 8acfad221e..38005cae2b 100644 --- a/test/powershell/engine/Help/HelpSystem.OnlineHelp.Tests.ps1 +++ b/test/powershell/engine/Help/HelpSystem.OnlineHelp.Tests.ps1 @@ -1,6 +1,6 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -Describe 'Online help tests for PowerShell Core Cmdlets' -Tags "CI" { +Describe 'Online help tests for PowerShell Cmdlets' -Tags "CI" { # The csv files (V2Cmdlets.csv and V3Cmdlets.csv) contain a list of cmdlets and expected HelpURIs. # The HelpURI is part of the cmdlet metadata, and when the user runs 'get-help -online' diff --git a/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1 b/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1 index 687d39d367..f3f733a0b3 100644 --- a/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1 +++ b/test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1 @@ -4,7 +4,7 @@ Import-Module HelpersCommon # Test Settings: -# This is the list of PowerShell Core modules for which we test update-help +# This is the list of PowerShell modules for which we test update-help $powershellCoreModules = @( "CimCmdlets" <# @@ -43,7 +43,7 @@ else $userHelpRoot = Join-Path $userModulesRoot -ChildPath ".." -AdditionalChildPath "Help" } -# This is the list of test cases -- each test case represents a PowerShell Core module. +# This is the list of test cases -- each test case represents a PowerShell module. $testCases = @{ "CimCmdlets" = @{ @@ -338,7 +338,7 @@ function ValidateSaveHelp $helpInfoFile | Should -Be $expectedHelpInfoFile -Because "Save-Help for $module should download '$expectedHelpInfoFile'" } -Describe "Validate Update-Help from the Web for one PowerShell Core module." -Tags @('CI', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { +Describe "Validate Update-Help from the Web for one PowerShell module." -Tags @('CI', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { BeforeAll { $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" @@ -350,7 +350,7 @@ Describe "Validate Update-Help from the Web for one PowerShell Core module." -Ta RunUpdateHelpTests -tag "CI" -Scope 'AllUsers' } -Describe "Validate Update-Help from the Web for one PowerShell Core module for user scope." -Tags @('CI', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { +Describe "Validate Update-Help from the Web for one PowerShell module for user scope." -Tags @('CI', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { BeforeAll { $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" @@ -362,7 +362,7 @@ Describe "Validate Update-Help from the Web for one PowerShell Core module for u RunUpdateHelpTests -tag "CI" -Scope 'CurrentUser' } -Describe "Validate Update-Help from the Web for all PowerShell Core modules." -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { +Describe "Validate Update-Help from the Web for all PowerShell modules." -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { BeforeAll { $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" @@ -374,7 +374,7 @@ Describe "Validate Update-Help from the Web for all PowerShell Core modules." -T RunUpdateHelpTests -tag "Feature" -Scope 'AllUsers' } -Describe "Validate Update-Help from the Web for all PowerShell Core modules for user scope." -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { +Describe "Validate Update-Help from the Web for all PowerShell modules for user scope." -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { BeforeAll { $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" @@ -386,7 +386,7 @@ Describe "Validate Update-Help from the Web for all PowerShell Core modules for RunUpdateHelpTests -tag "Feature" -Scope 'CurrentUser' } -Describe "Validate Update-Help -SourcePath for one PowerShell Core module." -Tags @('CI', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { +Describe "Validate Update-Help -SourcePath for one PowerShell module." -Tags @('CI', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { BeforeAll { $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" @@ -398,7 +398,7 @@ Describe "Validate Update-Help -SourcePath for one PowerShell Core module." -Tag RunUpdateHelpTests -tag "CI" -useSourcePath -Scope 'AllUsers' } -Describe "Validate Update-Help -SourcePath for one PowerShell Core module for user scope." -Tags @('CI', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { +Describe "Validate Update-Help -SourcePath for one PowerShell module for user scope." -Tags @('CI', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { BeforeAll { $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" @@ -410,7 +410,7 @@ Describe "Validate Update-Help -SourcePath for one PowerShell Core module for us RunUpdateHelpTests -tag "CI" -useSourcePath -Scope 'CurrentUser' } -Describe "Validate Update-Help -SourcePath for all PowerShell Core modules." -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { +Describe "Validate Update-Help -SourcePath for all PowerShell modules." -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { BeforeAll { $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" @@ -422,7 +422,7 @@ Describe "Validate Update-Help -SourcePath for all PowerShell Core modules." -Ta RunUpdateHelpTests -tag "Feature" -useSourcePath -Scope 'AllUsers' } -Describe "Validate Update-Help -SourcePath for all PowerShell Core modules for user scope." -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { +Describe "Validate Update-Help -SourcePath for all PowerShell modules for user scope." -Tags @('Feature', 'RequireAdminOnWindows', 'RequireSudoOnUnix') { BeforeAll { $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" @@ -434,7 +434,7 @@ Describe "Validate Update-Help -SourcePath for all PowerShell Core modules for u RunUpdateHelpTests -tag "Feature" -useSourcePath -Scope 'CurrentUser' } -Describe "Validate 'Save-Help -DestinationPath for one PowerShell Core modules." -Tags @('CI', 'RequireAdminOnWindows') { +Describe "Validate 'Save-Help -DestinationPath for one PowerShell modules." -Tags @('CI', 'RequireAdminOnWindows') { BeforeAll { $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" @@ -445,7 +445,7 @@ Describe "Validate 'Save-Help -DestinationPath for one PowerShell Core modules." RunSaveHelpTests -tag "CI" } -Describe "Validate 'Save-Help -DestinationPath for all PowerShell Core modules." -Tags @('Feature', 'RequireAdminOnWindows') { +Describe "Validate 'Save-Help -DestinationPath for all PowerShell modules." -Tags @('Feature', 'RequireAdminOnWindows') { BeforeAll { $SavedProgressPreference = $ProgressPreference $ProgressPreference = "SilentlyContinue" diff --git a/test/powershell/engine/Module/ModulePath.Tests.ps1 b/test/powershell/engine/Module/ModulePath.Tests.ps1 index 00b63aa40c..d038fe7f2c 100644 --- a/test/powershell/engine/Module/ModulePath.Tests.ps1 +++ b/test/powershell/engine/Module/ModulePath.Tests.ps1 @@ -74,7 +74,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" { } } - It "ignore pshome module path derived from a different powershell core instance" -Skip:(!$IsCoreCLR -or $skipNoPwsh) { + It "ignore pshome module path derived from a different PowerShell instance" -Skip:(!$IsCoreCLR -or $skipNoPwsh) { ## Create 'powershell' and 'pwsh.deps.json' in the fake PSHome folder, ## so that the module path calculation logic would believe it's real. @@ -83,7 +83,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" { try { - ## PSHome module path derived from another powershell core instance should be ignored + ## PSHome module path derived from another PowerShell instance should be ignored $env:PSModulePath = $fakePSHomeModuleDir $newModulePath = & $powershell -nopro -c '$env:PSModulePath' $paths = $newModulePath -split [System.IO.Path]::PathSeparator @@ -113,9 +113,9 @@ Describe "SxS Module Path Basic Tests" -tags "CI" { } } - It "keep non-pshome module path derived from powershell core instance parent" -Skip:(!$IsCoreCLR -or $skipNoPwsh) { + It "keep non-pshome module path derived from PowerShell instance parent" -Skip:(!$IsCoreCLR -or $skipNoPwsh) { - ## non-pshome module path derived from another powershell core instance should be preserved + ## non-pshome module path derived from another PowerShell instance should be preserved $customeModules = Join-Path -Path $TestDrive -ChildPath 'CustomModules' $env:PSModulePath = $fakePSHomeModuleDir, $customeModules -join ([System.IO.Path]::PathSeparator) $newModulePath = & $powershell -nopro -c '$env:PSModulePath' diff --git a/test/powershell/engine/Module/TestModuleManifest.Tests.ps1 b/test/powershell/engine/Module/TestModuleManifest.Tests.ps1 index a40123adb5..d7ed2b1d58 100644 --- a/test/powershell/engine/Module/TestModuleManifest.Tests.ps1 +++ b/test/powershell/engine/Module/TestModuleManifest.Tests.ps1 @@ -82,7 +82,7 @@ Describe "Test-ModuleManifest tests" -tags "CI" { It "module manifest containing valid processed empty rootmodule file type fails: " -TestCases ( @{rootModuleValue = "foo.cdxml"; error = "System.Xml.XmlException"}, # fails when cmdlet tries to read it as XML - @{rootModuleValue = "foo.xaml"; error = "Modules_WorkflowModuleNotSupported"} # not supported on PowerShell Core + @{rootModuleValue = "foo.xaml"; error = "Modules_WorkflowModuleNotSupported"} # not supported on PowerShell 6+ ) { param($rootModuleValue, $error) diff --git a/tools/install-powershell.ps1 b/tools/install-powershell.ps1 index f04ad09e4e..bc833815e8 100644 --- a/tools/install-powershell.ps1 +++ b/tools/install-powershell.ps1 @@ -2,14 +2,14 @@ # Licensed under the MIT License. <# .Synopsis - Install PowerShell Core on Windows, Linux or macOS. + Install PowerShell on Windows, Linux or macOS. .DESCRIPTION - By default, the latest PowerShell Core release package will be installed. - If '-Daily' is specified, then the latest PowerShell Core daily package will be installed. + By default, the latest PowerShell release package will be installed. + If '-Daily' is specified, then the latest PowerShell daily package will be installed. .Parameter Destination - The destination path to install PowerShell Core to. + The destination path to install PowerShell to. .Parameter Daily - Install PowerShell Core from the daily build. + Install PowerShell from the daily build. Note that the 'PackageManagement' module is required to install a daily package. .Parameter DoNotOverwrite Do not overwrite the destination folder if it already exists. @@ -245,7 +245,7 @@ try { if ($Daily) { if (-not (Get-Module -Name PackageManagement -ListAvailable)) { - throw "PackageManagement module is required to install daily PowerShell Core." + throw "PackageManagement module is required to install daily PowerShell." } if ($architecture -ne "x64") { @@ -423,7 +423,7 @@ try { } if (-not $UseMSI) { - Write-Host "PowerShell Core has been installed at $Destination" -ForegroundColor Green + Write-Host "PowerShell has been installed at $Destination" -ForegroundColor Green if ($Destination -eq $PSHome) { Write-Host "Please restart pwsh" -ForegroundColor Magenta } diff --git a/tools/install-powershell.sh b/tools/install-powershell.sh index 72c00d2018..0680c1860a 100755 --- a/tools/install-powershell.sh +++ b/tools/install-powershell.sh @@ -21,7 +21,7 @@ install(){ # -includeide - installs VSCode and VSCode PowerShell extension (only relevant to machines with desktop environment) # -interactivetesting - do a quick launch test of VSCode (only relevant when used with -includeide) # -skip-sudo-check - use sudo without verifying its availability (hard to accurately do on some distros) - # -preview - installs the latest preview release of PowerShell core side-by-side with any existing production releases + # -preview - installs the latest preview release of PowerShell side-by-side with any existing production releases #gitrepo paths are overrideable to run from your own fork or branch for testing or private distribution @@ -30,8 +30,8 @@ install(){ local gitreposcriptroot="https://raw.githubusercontent.com/$gitreposubpath/tools" local gitscriptname="install-powershell.psh" - echo "Get-PowerShell Core MASTER Installer Version $VERSION" - echo "Installs PowerShell Core and Optional The Development Environment" + echo "Get-PowerShell MASTER Installer Version $VERSION" + echo "Installs PowerShell and Optional The Development Environment" echo " Original script is at: $gitreposcriptroot\\$gitscriptname" echo "Arguments used: $*" @@ -128,7 +128,7 @@ install(){ if [ "$DistroBasedOn" == "redhat" ] || [ "$DistroBasedOn" == "debian" ] || [ "$DistroBasedOn" == "osx" ] || [ "$DistroBasedOn" == "suse" ] || [ "$DistroBasedOn" == "amazonlinux" ]; then - echo "Configuring PowerShell Core Environment for: $DistroBasedOn $DIST $REV" + echo "Configuring PowerShell Environment for: $DistroBasedOn $DIST $REV" if [ -f "$SCRIPTFOLDER/installpsh-$DistroBasedOn.sh" ]; then #Script files were copied local - use them # shellcheck source=/dev/null @@ -148,7 +148,7 @@ install(){ fi fi else - echo "Sorry, your operating system is based on $DistroBasedOn and is not supported by PowerShell Core or this installer at this time." + echo "Sorry, your operating system is based on $DistroBasedOn and is not supported by PowerShell or this installer at this time." fi } diff --git a/tools/installpsh-amazonlinux.sh b/tools/installpsh-amazonlinux.sh index 9e602e64f1..af624602f9 100755 --- a/tools/installpsh-amazonlinux.sh +++ b/tools/installpsh-amazonlinux.sh @@ -7,7 +7,7 @@ #bash <(wget -O - https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/installpsh-amazonlinux.sh) ARGUMENTS #bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/installpsh-amazonlinux.sh) -#Usage - if you do not have the ability to run scripts directly from the web, +#Usage - if you do not have the ability to run scripts directly from the web, # pull all files in this repo folder and execute, this script # automatically prefers local copies of sub-scripts @@ -17,7 +17,7 @@ # -includeide - ignored, as Amazon Linux does not have a desktop environment # -interactivetesting - ignored, as Amazon Linux does not have a desktop environment # -skip-sudo-check - use sudo without verifying its availability (hard to accurately do on some distros) -# -preview - installs the latest preview release of PowerShell core side-by-side with any existing production releases +# -preview - installs the latest preview release of PowerShell side-by-side with any existing production releases #gitrepo paths are overrideable to run from your own fork or branch for testing or private distribution @@ -31,7 +31,7 @@ gitscriptname="installpsh-amazonlinux.psh" pwshlink=/usr/bin/pwsh echo -echo "*** PowerShell Core Development Environment Installer $VERSION for $thisinstallerdistro" +echo "*** PowerShell Development Environment Installer $VERSION for $thisinstallerdistro" echo "*** Original script is at: $gitreposcriptroot/$gitscriptname" echo echo "*** Arguments used: $*" @@ -111,7 +111,7 @@ fi #END Verify The Installer Choice echo -echo "*** Installing prerequisites for PowerShell Core..." +echo "*** Installing prerequisites for PowerShell..." $SUDO yum install -y \ curl \ libunwind \ @@ -126,7 +126,7 @@ $SUDO yum install -y \ ##END Check requirements and prerequisites echo -echo "*** Installing PowerShell Core for $DistroBasedOn..." +echo "*** Installing PowerShell for $DistroBasedOn..." echo "ATTENTION: As of version 1.2.0 this script no longer uses pre-releases unless the '-preview' switch is used" @@ -197,8 +197,8 @@ if [[ "'$*'" =~ -interactivetesting ]] ; then fi if [[ "$repobased" == true ]] ; then - echo "*** NOTE: Run your regular package manager update cycle to update PowerShell Core" + echo "*** NOTE: Run your regular package manager update cycle to update PowerShell" else - echo "*** NOTE: Re-run this script to update PowerShell Core" + echo "*** NOTE: Re-run this script to update PowerShell" fi echo "*** Install Complete" diff --git a/tools/installpsh-debian.sh b/tools/installpsh-debian.sh index a8c912a379..9837558ed7 100755 --- a/tools/installpsh-debian.sh +++ b/tools/installpsh-debian.sh @@ -15,7 +15,7 @@ # -includeide - installs VSCode and VSCode PowerShell extension (only relevant to machines with desktop environment) # -interactivetesting - do a quick launch test of VSCode (only relevant when used with -includeide) # -skip-sudo-check - use sudo without verifying its availability (hard to accurately do on some distros) -# -preview - installs the latest preview release of PowerShell core side-by-side with any existing production releases +# -preview - installs the latest preview release of PowerShell side-by-side with any existing production releases #gitrepo paths are overrideable to run from your own fork or branch for testing or private distribution @@ -28,7 +28,7 @@ gitscriptname="installpsh-debian.psh" powershellpackageid=powershell echo ; -echo "*** PowerShell Core Development Environment Installer $VERSION for $thisinstallerdistro" +echo "*** PowerShell Development Environment Installer $VERSION for $thisinstallerdistro" echo "*** Original script is at: $gitreposcriptroot/$gitscriptname" echo echo "*** Arguments used: $*" @@ -115,7 +115,7 @@ DISTRIB_ID=$(lowercase "$DISTRIB_ID") ##END Check requirements and prerequisites echo -echo "*** Installing PowerShell Core for $DistroBasedOn..." +echo "*** Installing PowerShell for $DistroBasedOn..." if ! hash curl 2>/dev/null; then echo "curl not found, installing..." $SUDO apt-get install -y curl @@ -130,7 +130,7 @@ fi currentversion=$(curl https://api.github.com/repos/powershell/powershell/releases/latest | sed '/tag_name/!d' | sed s/\"tag_name\"://g | sed s/\"//g | sed s/v// | sed s/,//g | sed s/\ //g) echo "*** Current version on git is: $currentversion, repo version may differ slightly..." -echo "*** Setting up PowerShell Core repo..." +echo "*** Setting up PowerShell repo..." # Import the public repository GPG keys curl https://packages.microsoft.com/keys/microsoft.asc | $SUDO apt-key add - #Add the Repo @@ -153,7 +153,7 @@ if [[ "${DISTRIB_ID}" = "linuxmint" ]]; then echo "Supported versions: 19" >&2 echo "For additional versions open an issue or pull request at: https://github.com/powershell/powershell" >&2 exit 1 - ;; + ;; esac echo "Remapping linuxmint version ${LINUXMINT_VERSION} to ubuntu version ${DISTRIB_RELEASE}" >&2 fi @@ -230,6 +230,6 @@ fi if [[ "$repobased" == true ]] ; then echo - echo "*** NOTE: Run your regular package manager update cycle to update PowerShell Core" + echo "*** NOTE: Run your regular package manager update cycle to update PowerShell" fi echo "*** Install Complete" diff --git a/tools/installpsh-osx.sh b/tools/installpsh-osx.sh index 1206a12889..d61be1da18 100755 --- a/tools/installpsh-osx.sh +++ b/tools/installpsh-osx.sh @@ -5,7 +5,7 @@ #bash <(wget -O - https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/installpsh-osx.sh) ARGUMENTS #bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/installpsh-osx.sh) -#Usage - if you do not have the ability to run scripts directly from the web, +#Usage - if you do not have the ability to run scripts directly from the web, # pull all files in this repo folder and execute, this script # automatically prefers local copies of sub-scripts @@ -14,7 +14,7 @@ #Switches # -includeide - installs vscode and vscode PowerShell extension (only relevant to machines with desktop environment) # -interactivetesting - do a quick launch test of vscode (only relevant when used with -includeide) -# -preview - installs the latest preview release of PowerShell core side-by-side with any existing production releases +# -preview - installs the latest preview release of PowerShell side-by-side with any existing production releases #gitrepo paths are overrideable to run from your own fork or branch for testing or private distribution @@ -27,7 +27,7 @@ repobased=true gitscriptname="installpsh-osx.sh" powershellpackageid=powershell -echo "*** PowerShell Core Development Environment Installer $VERSION for $thisinstallerdistro" +echo "*** PowerShell Development Environment Installer $VERSION for $thisinstallerdistro" echo "*** Original script is at: $gitreposcriptroot/$gitscriptname" echo "*** Arguments used: $*" @@ -83,7 +83,7 @@ fi ## Check requirements and prerequisites -echo "*** Installing PowerShell Core for $DistroBasedOn..." +echo "*** Installing PowerShell for $DistroBasedOn..." if [[ "'$*'" =~ preview ]] ; then echo @@ -173,6 +173,6 @@ if [[ "$success" != 0 ]]; then fi if [[ "$repobased" == true ]] ; then - echo "*** NOTE: Run your regular package manager update cycle to update PowerShell Core" + echo "*** NOTE: Run your regular package manager update cycle to update PowerShell" fi echo "*** Install Complete" diff --git a/tools/installpsh-redhat.sh b/tools/installpsh-redhat.sh index 4636754e8a..c6398f0c41 100755 --- a/tools/installpsh-redhat.sh +++ b/tools/installpsh-redhat.sh @@ -5,7 +5,7 @@ #bash <(wget -O - https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/installpsh-redhat.sh) ARGUMENTS #bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/installpsh-redhat.sh) -#Usage - if you do not have the ability to run scripts directly from the web, +#Usage - if you do not have the ability to run scripts directly from the web, # pull all files in this repo folder and execute, this script # automatically prefers local copies of sub-scripts @@ -15,7 +15,7 @@ # -includeide - installs VSCode and VSCode PowerShell extension (only relevant to machines with desktop environment) # -interactivetesting - do a quick launch test of VSCode (only relevant when used with -includeide) # -skip-sudo-check - use sudo without verifying its availability (this is required to run in the VSTS Hosted Linux Preview) -# -preview - installs the latest preview release of PowerShell core side-by-side with any existing production releases +# -preview - installs the latest preview release of PowerShell side-by-side with any existing production releases #gitrepo paths are overrideable to run from your own fork or branch for testing or private distribution @@ -29,7 +29,7 @@ gitscriptname="installpsh-redhat.psh" powershellpackageid=powershell echo -echo "*** PowerShell Core Development Environment Installer $VERSION for $thisinstallerdistro" +echo "*** PowerShell Development Environment Installer $VERSION for $thisinstallerdistro" echo "*** Original script is at: $gitreposcriptroot/$gitscriptname" echo echo "*** Arguments used: $* " @@ -111,7 +111,7 @@ if [[ "'$*'" =~ preview ]] ; then fi release=$(curl https://api.github.com/repos/powershell/powershell/releases/latest | sed '/tag_name/!d' | sed s/\"tag_name\"://g | sed s/\"//g | sed s/v// | sed s/,//g | sed s/\ //g) -echo "*** Installing PowerShell Core for $DistroBasedOn..." +echo "*** Installing PowerShell for $DistroBasedOn..." if ! hash curl 2>/dev/null; then echo "curl not found, installing..." $SUDO yum install -y curl @@ -120,7 +120,7 @@ release=$(curl https://api.github.com/repos/powershell/powershell/releases/lates echo "*** Current version on git is: $release, repo version may differ slightly..." -echo "*** Setting up PowerShell Core repo..." +echo "*** Setting up PowerShell repo..." $SUDO curl https://packages.microsoft.com/config/rhel/7/prod.repo > /etc/yum.repos.d/microsoft.repo $SUDO yum install -y ${powershellpackageid} @@ -155,6 +155,6 @@ if [[ "'$*'" =~ includeide ]] ; then fi if [[ "$repobased" == true ]] ; then - echo "*** NOTE: Run your regular package manager update cycle to update PowerShell Core" + echo "*** NOTE: Run your regular package manager update cycle to update PowerShell" fi echo "*** Install Complete" diff --git a/tools/installpsh-suse.sh b/tools/installpsh-suse.sh index 0d8005f4ae..2ca08bcba2 100755 --- a/tools/installpsh-suse.sh +++ b/tools/installpsh-suse.sh @@ -5,7 +5,7 @@ #bash <(wget -O - https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/installpsh-suse.sh) ARGUMENTS #bash <(curl -s https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/installpsh-suse.sh) -#Usage - if you do not have the ability to run scripts directly from the web, +#Usage - if you do not have the ability to run scripts directly from the web, # pull all files in this repo folder and execute, this script # automatically prefers local copies of sub-scripts @@ -15,7 +15,7 @@ # -includeide - installs VSCode and VSCode PowerShell extension (only relevant to machines with desktop environment) # -interactivetesting - do a quick launch test of VSCode (only relevant when used with -includeide) # -skip-sudo-check - use sudo without verifying its availability (this is required to run in the VSTS Hosted Linux Preview) -# -preview - installs the latest preview release of PowerShell core side-by-side with any existing production releasesS +# -preview - installs the latest preview release of PowerShell side-by-side with any existing production releasesS #gitrepo paths are overrideable to run from your own fork or branch for testing or private distribution @@ -29,7 +29,7 @@ gitscriptname="installpsh-suse.psh" pwshlink=/usr/bin/pwsh echo -echo "*** PowerShell Core Development Environment Installer $VERSION for $thisinstallerdistro" +echo "*** PowerShell Development Environment Installer $VERSION for $thisinstallerdistro" echo "*** Original script is at: $gitreposcriptroot/$gitscriptname" echo echo "*** Arguments used: $*" @@ -123,7 +123,7 @@ fi #END Verify The Installer Choice echo -echo "*** Installing prerequisites for PowerShell Core..." +echo "*** Installing prerequisites for PowerShell..." $SUDO zypper --non-interactive install \ glibc-locale \ glibc-i18ndata \ @@ -137,7 +137,7 @@ $SUDO zypper --non-interactive install \ ##END Check requirements and prerequisites echo -echo "*** Installing PowerShell Core for $DistroBasedOn..." +echo "*** Installing PowerShell for $DistroBasedOn..." echo "ATTENTION: As of version 1.2.0 this script no longer uses pre-releases unless the '-preview' switch is used" @@ -156,12 +156,12 @@ downloadurl=https://github.com/PowerShell/PowerShell/releases/download/v$release #REPO BASED (Not ready yet) -#echo "*** Setting up PowerShell Core repo..." +#echo "*** Setting up PowerShell repo..." #echo "*** Current version on git is: $release, repo version may differ slightly..." ## Install the Microsoft public key so that zypper trusts the package #sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc ##Add the Repo -#$SUDO sh -c 'echo -e "[code]\nname=PowerShell Core\nbaseurl=https://packages.microsoft.com/yumrepos/microsoft-sles12-prod\nenabled=1\ntype=rpm-md\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/zypp/repos.d/powershellcore.repo' +#$SUDO sh -c 'echo -e "[code]\nname=PowerShell\nbaseurl=https://packages.microsoft.com/yumrepos/microsoft-sles12-prod\nenabled=1\ntype=rpm-md\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc" > /etc/zypp/repos.d/powershellcore.repo' ## Update zypper #$SUDO zypper refresh ## Install PowerShell @@ -228,8 +228,8 @@ if [[ "'$*'" =~ includeide ]] ; then fi if [[ "$repobased" == true ]] ; then - echo "*** NOTE: Run your regular package manager update cycle to update PowerShell Core" + echo "*** NOTE: Run your regular package manager update cycle to update PowerShell" else - echo "*** NOTE: Re-run this script to update PowerShell Core" + echo "*** NOTE: Re-run this script to update PowerShell" fi echo "*** Install Complete" diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1 index e1f83bc24b..239e61e47c 100644 --- a/tools/packaging/packaging.strings.psd1 +++ b/tools/packaging/packaging.strings.psd1 @@ -121,7 +121,7 @@ open {0} Microsoft Microsoft,PowerShell true - PowerShell runtime for hosting PowerShell Core + Runtime for hosting PowerShell https://github.com/PowerShell/PowerShell https://github.com/PowerShell/PowerShell/blob/master/assets/Powershell_black_64.png?raw=true https://github.com/PowerShell/PowerShell/blob/master/LICENSE.txt @@ -159,7 +159,7 @@ open {0} https://github.com/PowerShell/PowerShell https://github.com/PowerShell/PowerShell/blob/master/assets/Powershell_black_64.png?raw=true false - PowerShell Core global tool + PowerShell global tool MIT PowerShell en-US diff --git a/tools/packaging/projects/nuget/package.csproj b/tools/packaging/projects/nuget/package.csproj index 5aa7a79d91..bb6c3dbef8 100644 --- a/tools/packaging/projects/nuget/package.csproj +++ b/tools/packaging/projects/nuget/package.csproj @@ -1,12 +1,12 @@ NotUsed - PowerShell Core nuget package with .NET CLI host including everything needed to run it. + PowerShell nuget package with .NET CLI host including everything needed to run it. powershell.nuspec runtime=$(RID);version=$(SemVer);PackageName=$(PackageName) $(StagingPath) diff --git a/tools/packaging/projects/nuget/powershell.nuspec b/tools/packaging/projects/nuget/powershell.nuspec index da67106f43..db3be245da 100644 --- a/tools/packaging/projects/nuget/powershell.nuspec +++ b/tools/packaging/projects/nuget/powershell.nuspec @@ -3,14 +3,14 @@ $PackageName$-$runtime$ $version$ - PowerShell Core for $runtime$ + PowerShell for $runtime$ PowerShell PowerShell false MIT https://github.com/powershell/powershell https://github.com/PowerShell/PowerShell/blob/master/assets/Powershell_64.png - This package contains the PowerShell Core for $runtime$. + This package contains PowerShell for $runtime$. Copyright (c) Microsoft Corporation. All rights reserved. PowerShell diff --git a/tools/windows/Reset-PWSHSystemPath.ps1 b/tools/windows/Reset-PWSHSystemPath.ps1 index 8f8c41b9ec..619c01b9b1 100644 --- a/tools/windows/Reset-PWSHSystemPath.ps1 +++ b/tools/windows/Reset-PWSHSystemPath.ps1 @@ -3,7 +3,7 @@ <# .SYNOPSIS - Idempotently removes extra PowerShell Core paths from the machine, user and/or process environment scope with no reordering. + Idempotently removes extra PowerShell paths from the machine, user and/or process environment scope with no reordering. .DESCRIPTION Defaults to machine scope and leaving the last sorted path alone. @@ -17,21 +17,21 @@ Default: machine .PARAMETER RemoveAllOccurences - By default the cleanup leaves the highest sorted PowerShell Core path alone. + By default the cleanup leaves the highest sorted PowerShell path alone. This switch causes it to be cleaned up as well. Default: false .EXAMPLE .\Reset-PWSHSystemPath.ps1 - Removes all PowerShell core paths but the very last one when sorted in ascending order from the Machine level path. + Removes all PowerShell paths but the very last one when sorted in ascending order from the Machine level path. Good for running on systems that already has at least one valid PowerShell install. .EXAMPLE .\Reset-PWSHSystemPath.ps1 -RemoveAllOccurences - Removes ALL PowerShell core paths from the Machine level path. - Good for running right before upgrading PowerShell core. + Removes ALL PowerShell paths from the Machine level path. + Good for running right before upgrading PowerShell. .EXAMPLE .\Reset-PWSHSystemPath.ps1 -PathScope Machine, User, Process @@ -52,11 +52,11 @@ param ( ForEach ($PathScopeItem in $PathScope) { $AssembledNewPath = $NewPath = '' - #From the current path scope. retrieve the array of paths that match the pathspec of PowerShell Core (to use as a filter) + #From the current path scope. retrieve the array of paths that match the pathspec of PowerShell (to use as a filter) $pathstoremove = @([Environment]::GetEnvironmentVariable("PATH","$PathScopeItem").split(';') | Where { $_ -ilike "*\Program Files\Powershell\6*"}) If (!$RemoveAllOccurences) { - #If we are not removing all occurances of powershell core paths, then remove the highest sorted path from the filter + #If we are not removing all occurances of PowerShell paths, then remove the highest sorted path from the filter $pathstoremove = @($pathstoremove | sort-object | Select-Object -skiplast 1) } Write-Verbose "Reset-PWSHSystemPath: Found $($pathstoremove.count) paths to remove from $PathScopeItem path scope: $($Pathstoremove -join ', ' | out-string)"