Skip to content

Commit a96b4c0

Browse files
SteveL-MSFTdaxian-dbw
SteveL-MSFT
authored and
daxian-dbw
committed
Update use of "PowerShell Core" to just "PowerShell" (PowerShell#9513)
1 parent ade85b4 commit a96b4c0

60 files changed

Lines changed: 187 additions & 187 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎PowerShell.Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</Target>
9090

9191
<PropertyGroup>
92-
<Product>PowerShell Core</Product>
92+
<Product>PowerShell</Product>
9393
<Company>Microsoft Corporation</Company>
9494
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
9595

‎assets/AppxManifest.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="utf-8"?>
22

33
<Package IgnorableNamespaces="uap mp rescap desktop6"
4-
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
5-
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
6-
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
7-
xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
4+
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
5+
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
6+
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
7+
xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
88
xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
99
xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
1010
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
1111

1212
<Identity Name="Microsoft.PowerShell" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="$VERSION$" />
1313

1414
<Properties>
15-
<DisplayName>PowerShell Core 6</DisplayName>
15+
<DisplayName>PowerShell 7</DisplayName>
1616
<PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
1717
<Logo>assets\StoreLogo.png</Logo>
1818
<desktop6:RegistryWriteVirtualization>disabled</desktop6:RegistryWriteVirtualization>
@@ -36,7 +36,7 @@
3636
</uap3:AppExecutionAlias>
3737
</uap3:Extension>
3838
</Extensions>
39-
<uap:VisualElements DisplayName="PowerShell Core 6" Description="PowerShell is an automation and configuration management platform. It consists of a cross-platform (Windows, Linux, and macOS) command-line shell and associated scripting language." BackgroundColor="transparent" Square150x150Logo="assets\Square150x150Logo.png" Square44x44Logo="assets\Square44x44Logo.png">
39+
<uap:VisualElements DisplayName="PowerShell 7" Description="PowerShell is an automation and configuration management platform. It consists of a cross-platform (Windows, Linux, and macOS) command-line shell and associated scripting language." BackgroundColor="transparent" Square150x150Logo="assets\Square150x150Logo.png" Square44x44Logo="assets\Square44x44Logo.png">
4040
</uap:VisualElements>
4141
</Application>
4242
</Applications>

‎assets/pwsh.manifest‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3-
<description> PowerShell Core 6 </description>
3+
<description> PowerShell 7</description>
44
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
55
<security>
66
<requestedPrivileges>
77
<requestedExecutionLevel
88
level="asInvoker"
99
uiAccess="false"
10-
/>
10+
/>
1111
</requestedPrivileges>
1212
</security>
1313
</trustInfo>
14-
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
15-
<application>
16-
<!-- Windows 10 -->
14+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
15+
<application>
16+
<!-- Windows 10 -->
1717
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
1818
<!-- Windows 8.1 -->
1919
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
2020
<!-- Windows 8 -->
2121
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
2222
<!-- Windows 7 -->
2323
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
24-
</application>
24+
</application>
2525
</compatibility>
2626
</assembly>

‎build.psm1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function Get-PSCommitId
100100
function Get-EnvironmentInformation
101101
{
102102
$environment = @{}
103-
# PowerShell Core will likely not be built on pre-1709 nanoserver
103+
# PowerShell will likely not be built on pre-1709 nanoserver
104104
if ($PSVersionTable.ContainsKey("PSEdition") -and "Core" -eq $PSVersionTable.PSEdition) {
105105
$environment += @{'IsCoreCLR' = $true}
106106
$environment += @{'IsLinux' = $IsLinux}
@@ -488,7 +488,7 @@ Fix steps:
488488
# fxdependent package does not have an executable to set iconPath etc.
489489
if ($Options.Runtime -ne 'fxdependent') {
490490
Start-NativeExecution { & $rcedit $pwshPath --set-icon $iconPath `
491-
--set-file-version $fileVersion --set-product-version $ReleaseVersion --set-version-string "ProductName" "PowerShell Core 6" `
491+
--set-file-version $fileVersion --set-product-version $ReleaseVersion --set-version-string "ProductName" "PowerShell 7" `
492492
--set-version-string "LegalCopyright" "(C) Microsoft Corporation. All Rights Reserved." `
493493
--application-manifest "$PSScriptRoot\assets\pwsh.manifest" } | Write-Verbose
494494
}
@@ -919,7 +919,7 @@ function Start-PSPester {
919919
[switch]$IncludeCommonTests,
920920
[string]$ExperimentalFeatureName,
921921
[Parameter(HelpMessage='Title to publish the results as.')]
922-
[string]$Title = 'PowerShell Core Tests',
922+
[string]$Title = 'PowerShell 7 Tests',
923923
[Parameter(ParameterSetName='Wait', Mandatory=$true,
924924
HelpMessage='Wait for the debugger to attach to PowerShell before Pester starts. Debug builds only!')]
925925
[switch]$Wait,
@@ -1737,7 +1737,7 @@ function Start-PSBootstrap {
17371737
## The VSCode build task requires 'pwsh.exe' to be found in Path
17381738
if (-not (Get-Command -Name pwsh.exe -CommandType Application -ErrorAction Ignore))
17391739
{
1740-
Write-Log "pwsh.exe not found. Install latest PowerShell Core release and add it to Path"
1740+
Write-Log "pwsh.exe not found. Install latest PowerShell release and add it to Path"
17411741
$psInstallFile = [System.IO.Path]::Combine($PSScriptRoot, "tools", "install-powershell.ps1")
17421742
& $psInstallFile -AddToPath
17431743
}

‎src/Microsoft.Management.Infrastructure.CimCmdlets/Microsoft.Management.Infrastructure.CimCmdlets.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
22
<Import Project="..\..\PowerShell.Common.props" />
33
<PropertyGroup>
4-
<Description>PowerShell Core's Microsoft.Management.Infrastructure.CimCmdlets project</Description>
4+
<Description>PowerShell's Microsoft.Management.Infrastructure.CimCmdlets project</Description>
55
<NoWarn>$(NoWarn);CS1570;CS1572;CS1573;CS1574;CS1584;CS1587;CS1591</NoWarn>
66
<AssemblyName>Microsoft.Management.Infrastructure.CimCmdlets</AssemblyName>
77
</PropertyGroup>

‎src/Microsoft.PowerShell.Commands.Diagnostics/ExportCounterCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ protected override void BeginProcessing()
162162
throw new PlatformNotSupportedException();
163163
}
164164

165-
// PowerShell Core requires at least Windows 7,
165+
// PowerShell 7 requires at least Windows 7,
166166
// so no version test is needed
167167
_pdhHelper = new PdhHelper(false);
168168
#else

‎src/Microsoft.PowerShell.Commands.Diagnostics/GetCounterCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ protected override void BeginProcessing()
218218
throw new PlatformNotSupportedException();
219219
}
220220

221-
// PowerShell Core requires at least Windows 7,
221+
// PowerShell 7 requires at least Windows 7,
222222
// so no version test is needed
223223
_pdhHelper = new PdhHelper(false);
224224
#else

‎src/Microsoft.PowerShell.Commands.Diagnostics/ImportCounterCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ protected override void BeginProcessing()
201201
throw new PlatformNotSupportedException();
202202
}
203203

204-
// PowerShell Core requires at least Windows 7,
204+
// PowerShell 7 requires at least Windows 7,
205205
// so no version test is needed
206206
_pdhHelper = new PdhHelper(false);
207207
#else

‎src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
22
<Import Project="..\..\PowerShell.Common.props" />
33
<PropertyGroup>
4-
<Description>PowerShell Core's Microsoft.PowerShell.Commands.Diagnostics project</Description>
4+
<Description>PowerShell's Microsoft.PowerShell.Commands.Diagnostics project</Description>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
<AssemblyName>Microsoft.PowerShell.Commands.Diagnostics</AssemblyName>
77
</PropertyGroup>

‎src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
22
<Import Project="..\..\PowerShell.Common.props" />
33
<PropertyGroup>
4-
<Description>PowerShell Core's Microsoft.PowerShell.Commands.Management project</Description>
4+
<Description>PowerShell's Microsoft.PowerShell.Commands.Management project</Description>
55
<NoWarn>$(NoWarn);CS1570</NoWarn>
66
<AssemblyName>Microsoft.PowerShell.Commands.Management</AssemblyName>
77
</PropertyGroup>

0 commit comments

Comments
 (0)