Update use of "PowerShell Core" to just "PowerShell" (#9513)

PowerShell.Common.props

@@ -89,7 +89,7 @@
   </Target>
 
   <PropertyGroup>
-    <Product>PowerShell Core</Product>
+    <Product>PowerShell</Product>
     <Company>Microsoft Corporation</Company>
     <Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
 

assets/AppxManifest.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <Package IgnorableNamespaces="uap mp rescap desktop6"
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" 
-  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" 
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" 
-  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" 
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
   xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
   xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
 
   <Identity Name="Microsoft.PowerShell" Publisher="CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" Version="$VERSION$" />
 
   <Properties>
-    <DisplayName>PowerShell Core 6</DisplayName>
+    <DisplayName>PowerShell 7</DisplayName>
     <PublisherDisplayName>Microsoft Corporation</PublisherDisplayName>
     <Logo>assets\StoreLogo.png</Logo>
     <desktop6:RegistryWriteVirtualization>disabled</desktop6:RegistryWriteVirtualization>
@@ -36,7 +36,7 @@
           </uap3:AppExecutionAlias>
         </uap3:Extension>
       </Extensions>
-      <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">
+      <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">
       </uap:VisualElements>
     </Application>
   </Applications>

assets/pwsh.manifest

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-    <description> PowerShell Core 6 </description>
+    <description> PowerShell 7</description>
     <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
         <security>
             <requestedPrivileges>
                 <requestedExecutionLevel
                     level="asInvoker"
                     uiAccess="false"
-                />	
+                />
             </requestedPrivileges>
         </security>
     </trustInfo>
-    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
-        <application> 
-            <!-- Windows 10 --> 
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- Windows 10 -->
             <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
             <!-- Windows 8.1 -->
             <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
             <!-- Windows 8 -->
             <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
             <!-- Windows 7 -->
             <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-        </application> 
+        </application>
     </compatibility>
 </assembly>

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
             }

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
-    <Description>PowerShell Core's Microsoft.Management.Infrastructure.CimCmdlets project</Description>
+    <Description>PowerShell's Microsoft.Management.Infrastructure.CimCmdlets project</Description>
     <NoWarn>$(NoWarn);CS1570;CS1572;CS1573;CS1574;CS1584;CS1587;CS1591</NoWarn>
     <AssemblyName>Microsoft.Management.Infrastructure.CimCmdlets</AssemblyName>
   </PropertyGroup>

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

@@ -162,7 +162,7 @@ protected override void BeginProcessing()
                 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

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

@@ -218,7 +218,7 @@ protected override void BeginProcessing()
                 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

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

@@ -201,7 +201,7 @@ protected override void BeginProcessing()
                 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

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
-    <Description>PowerShell Core's Microsoft.PowerShell.Commands.Diagnostics project</Description>
+    <Description>PowerShell's Microsoft.PowerShell.Commands.Diagnostics project</Description>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AssemblyName>Microsoft.PowerShell.Commands.Diagnostics</AssemblyName>
   </PropertyGroup>

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
-    <Description>PowerShell Core's Microsoft.PowerShell.Commands.Management project</Description>
+    <Description>PowerShell's Microsoft.PowerShell.Commands.Management project</Description>
     <NoWarn>$(NoWarn);CS1570</NoWarn>
     <AssemblyName>Microsoft.PowerShell.Commands.Management</AssemblyName>
   </PropertyGroup>

src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
-    <Description>PowerShell Core's Microsoft.PowerShell.Commands.Utility project</Description>
+    <Description>PowerShell's Microsoft.PowerShell.Commands.Utility project</Description>
     <NoWarn>$(NoWarn);CS1570</NoWarn>
     <AssemblyName>Microsoft.PowerShell.Commands.Utility</AssemblyName>
   </PropertyGroup>

src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs

@@ -605,7 +605,7 @@ protected override void EndProcessing()
 
         #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 @@ private string ResolveAssemblyName(string assembly, bool isForReferenceAssembly)
 
             // 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)
             {

src/Microsoft.PowerShell.Commands.Utility/resources/NewObjectStrings.resx

@@ -145,6 +145,6 @@
     <value>Cannot create type. Only core types are supported in this language mode.</value>
   </data>
   <data name="ApartmentNotSupported" xml:space="preserve">
-    <value>{0} Please note that Single-Threaded Apartment is not supported in PowerShell Core.</value>
+    <value>{0} Please note that Single-Threaded Apartment is not supported in PowerShell.</value>
   </data>
 </root>

src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
-    <Description>PowerShell Core's Microsoft.PowerShell.CoreCLR.Eventing project</Description>
+    <Description>PowerShell's Microsoft.PowerShell.CoreCLR.Eventing project</Description>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AssemblyName>Microsoft.PowerShell.CoreCLR.Eventing</AssemblyName>
   </PropertyGroup>

src/Microsoft.PowerShell.GlobalTool.Shim/GlobalToolShim.cs

@@ -8,7 +8,7 @@
 namespace Microsoft.PowerShell.GlobalTool.Shim
 {
     /// <summary>
-    /// 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.
     /// </summary>
     public class EntryPoint
     {

src/Microsoft.PowerShell.LocalAccounts/Microsoft.PowerShell.LocalAccounts.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\..\PowerShell.Common.props"/>
 
   <PropertyGroup>
-    <Description>PowerShell Core's Microsoft.PowerShell.LocalAccounts project</Description>
+    <Description>PowerShell's Microsoft.PowerShell.LocalAccounts project</Description>
     <AssemblyName>Microsoft.PowerShell.LocalAccounts</AssemblyName>
   </PropertyGroup>
 

src/Microsoft.PowerShell.MarkdownRender/Microsoft.PowerShell.MarkdownRender.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\..\PowerShell.Common.props" />
 
   <PropertyGroup>
-    <Description>PowerShell Core's Markdown Rendering project</Description>
+    <Description>PowerShell's Markdown Rendering project</Description>
     <AssemblyName>Microsoft.PowerShell.MarkdownRender</AssemblyName>
   </PropertyGroup>
 

src/Microsoft.PowerShell.Security/Microsoft.PowerShell.Security.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
-    <Description>PowerShell Core's Microsoft.PowerShell.Security project</Description>
+    <Description>PowerShell's Microsoft.PowerShell.Security project</Description>
     <NoWarn>$(NoWarn);CS1570</NoWarn>
     <AssemblyName>Microsoft.PowerShell.Security</AssemblyName>
   </PropertyGroup>
@@ -16,5 +16,5 @@
 
     <EmbeddedResource Remove="resources\SecurityMshSnapinResources.resx" />
   </ItemGroup>
-  
+
 </Project>

src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
-    <Description>PowerShell Core's Microsoft.WSMan.Management project</Description>
+    <Description>PowerShell's Microsoft.WSMan.Management project</Description>
     <AssemblyName>Microsoft.WSMan.Management</AssemblyName>
   </PropertyGroup>
 

src/Microsoft.WSMan.Runtime/Microsoft.WSMan.Runtime.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
-    <Description>PowerShell Core's Microsoft.WSMan.Runtime project</Description>
+    <Description>PowerShell's Microsoft.WSMan.Runtime project</Description>
     <AssemblyName>Microsoft.WSMan.Runtime</AssemblyName>
   </PropertyGroup>
 

src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man

@@ -25,7 +25,7 @@
       xmlns:xs="http://www.w3.org/2001/XMLSchema"
       >
     <events xmlns="http://schemas.microsoft.com/win/2004/08/events">
-      <!--Defines an event provider for PowerShell Core
+      <!--Defines an event provider for PowerShell
           The Guid for this provider should not be changed. If it's
           changed for any reason, then the old manifest needs to be
           first uninstalled and then the changed manifest installed

src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs

@@ -150,7 +150,7 @@ internal static PowerShellAssemblyLoadContext Instance
         }
 
         /// <summary>
-        /// 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.
         /// </summary>
         internal IEnumerable<string> AvailableDotNetTypeNames
@@ -159,7 +159,7 @@ internal IEnumerable<string> AvailableDotNetTypeNames
         }
 
         /// <summary>
-        /// 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.
         /// </summary>
         internal HashSet<string> AvailableDotNetAssemblyNames

src/System.Management.Automation/System.Management.Automation.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <Import Project="..\..\PowerShell.Common.props" />
   <PropertyGroup>
-    <Description>PowerShell Core's System.Management.Automation project</Description>
+    <Description>PowerShell's System.Management.Automation project</Description>
     <NoWarn>$(NoWarn);CS1570;CS1734</NoWarn>
     <AssemblyName>System.Management.Automation</AssemblyName>
   </PropertyGroup>

src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs

@@ -4610,7 +4610,7 @@ internal string FixupFileName(string moduleBase, string name, string extension,
             //     - moduleBase = 'C:\Windows\System32\WindowsPowerShell\v1.0\Modules\Microsoft.WSMan.Management'
             //     - name = '..\..\WSMan.format.ps1xml'
             //    Check for combinedPath in this case will get us the normalized rooted path 'C:\Windows\System32\WindowsPowerShell\v1.0\WSMan.format.ps1xml'.
-            // The 'Microsoft.WSMan.Management' module in PowerShell Core was updated to not use the relative path for 'FormatsToProcess' entry,
+            // The 'Microsoft.WSMan.Management' module in PowerShell was updated to not use the relative path for 'FormatsToProcess' entry,
             // but it's safer to keep the original behavior to avoid unexpected breaking changes.
             string combinedPath = Path.Combine(moduleBase, name);
             string resolvedPath = IsRooted(name)

src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs

@@ -1234,7 +1234,7 @@ private static string RemoveSxSPsHomeModulePath(string currentProcessModulePath,
                     string psDepsPath = Path.Combine(parentDir, powershellDepsName);
                     if ((File.Exists(psExePath) && File.Exists(psDepsPath)))
                     {
-                        // Path is a PSHome module path from a different powershell core instance. Ignore it.
+                        // Path is a PSHome module path from a different PowerShell instance. Ignore it.
                         continue;
                     }
                 }

src/System.Management.Automation/engine/Modules/PSModuleInfo.cs

@@ -890,7 +890,7 @@ internal void AddToCompatiblePSEditions(IEnumerable<string> psEditions)
         /// Describes whether the module was considered compatible at load time.
         /// Any module not on the System32 module path should have this as true.
         /// Modules loaded from the System32 module path will have this as true if they
-        /// have declared edition compatibility with PowerShell Core. Currently, this field
+        /// have declared edition compatibility with PowerShell 6+. Currently, this field
         /// is true for all non-psd1 module files, when it should not be. Being able to
         /// load psm1/dll modules from the System32 module path without needing to skip
         /// the edition check is considered a bug and should be fixed.

src/System.Management.Automation/engine/UserFeedbackParameters.cs

@@ -168,7 +168,7 @@ public SwitchParameter Confirm
     /// <summary>
     /// The declaration of parameters for the Transactions mechanisms. -UseTransaction, and -BypassTransaction.
     /// </summary>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes", Justification = "These are only exposed by way of the PowerShell core cmdlets that surface them.")]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.MSInternal", "CA903:InternalNamespaceShouldNotContainPublicTypes", Justification = "These are only exposed by way of the PowerShell cmdlets that surface them.")]
     public sealed class TransactionParameters
     {
         #region ctor

src/System.Management.Automation/engine/remoting/client/ClientRemotePowerShell.cs

@@ -193,7 +193,7 @@ internal void StopAsync()
                 return;
             }
 
-            // powershell CoreStop would have handled cases
+            // PowerShell CoreStop would have handled cases
             // for NotStarted, Stopping and already Stopped
             // so at this point, there is no need to make any
             // check. The message simply needs to be sent