Skip to content

Update use of Windows PowerShell to just PowerShell in our logging #9508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iSazonov merged 1 commit into from
May 3, 2019
Merged

Update use of Windows PowerShell to just PowerShell in our logging #9508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Microsoft.PowerShell.Commands.Diagnostics/resources/GetEventResources.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Copyright (c) Microsoft Corporation. All rights reserved.

Vendor=Microsoft
Description=This Windows PowerShell snap-in contains Windows Eventing and Performance Counter cmdlets.
Description=This PowerShell snap-in contains Windows Eventing and Performance Counter cmdlets.

NoMatchingEventsFound=No events were found that match the specified selection criteria.
NoMatchingLogsFound=There is not an event log on the {0} computer that matches "{1}".
Expand Down Expand Up @@ -56,4 +56,4 @@ CounterCircularNoMaxSize=The Circular parameter will be ignored unless the MaxSi
ExportCtrWin7Required=This cmdlet can be run only on Microsoft Windows 7 and above.
FileOpenFailed=Unable to open the {0} file for writing.
FileCreateFailed=Unable to create the {0} file. Verify that the path is valid.
ExportDestPathAmbiguous=The following export destination path is ambiguous: {0}.
ExportDestPathAmbiguous=The following export destination path is ambiguous: {0}.
4 changes: 2 additions & 2 deletions src/Microsoft.WSMan.Management/resources/WsManResources.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# {0} = Delegate

Vendor=Microsoft
Description=This Windows PowerShell snap-in contains cmdlets (such as Get-WSManInstance and Set-WSManInstance) that are used by the Windows PowerShell host to manage WSMan operations.
Description=This PowerShell snap-in contains cmdlets (such as Get-WSManInstance and Set-WSManInstance) that are used by the PowerShell host to manage WSMan operations.
InvalidComputerName=The WinRM client cannot complete the operation.Check if the computer name is valid.
InvalidFileName=This command cannot be used because file does not exist.Check the file existence and run your command.
InvalidPath=This command cannot be used because root path does not exist.Check the root path and run your command.
Expand Down Expand Up @@ -65,4 +65,4 @@ SetItemWhatIfAndConfirmText= "Set-Item" on the WinRM configuration setting "{0}"
SetItemWarnigForPPQ=The updated configuration is effective only if it is less than or equal to the value of global quota {0}. Verify the value for the global quota using the PowerShell cmdlet "Get-Item {0}".
SetItemWarningForGlobalQuota=The updated configuration might affect the operation of the plugins having a per plugin quota value greater than {0}. Verify the configuration of all the registered plugins and change the per plugin quota values for the affected plugins.
SetItemServiceRestartWarning= The configuration changes you made will only be effective after the WinRM service is restarted. To restart the WinRM service, run the following command: 'Restart-Service winrm'
SetItemServiceRestartWarningRemote= The configuration changes you made will only be effective after the WinRM service is restarted on {0}.
SetItemServiceRestartWarningRemote= The configuration changes you made will only be effective after the WinRM service is restarted on {0}.
4 changes: 2 additions & 2 deletions src/Modules/Windows/Microsoft.PowerShell.Diagnostics/GetEvent.types.ps1xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- *******************************************************************
These sample files contain formatting information used by the Windows
These sample files contain formatting information used by the
PowerShell engine. Do not edit or change the contents of this file
directly. Please see the Windows PowerShell documentation or type
directly. Please see the PowerShell documentation or type
Get-Help Update-TypeData for more information.

Copyright (c) Microsoft Corporation. All rights reserved.
Expand Down
4 changes: 2 additions & 2 deletions src/Modules/Windows/Microsoft.WSMan.Management/WSMan.format.ps1xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- *******************************************************************
These sample files contain formatting information used by the Windows
These sample files contain formatting information used by the
PowerShell engine. Do not edit or change the contents of this file
directly. Please see the Windows PowerShell documentation or type
directly. Please see the PowerShell documentation or type
Get-Help Update-FormatData for more information.

Copyright (c) Microsoft Corporation. All rights reserved.
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/Windows/PSDiagnostics/PSDiagnostics.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Licensed under the MIT License.

<#
Windows PowerShell Diagnostics Module
PowerShell Diagnostics Module
This module contains a set of wrapper scripts that
enable a user to use ETW tracing in Windows
PowerShell.
Expand Down
14 changes: 7 additions & 7 deletions src/PowerShell.Core.Instrumentation/PowerShell.Core.Instrumentation.man
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
version="$(build.version)"
versionScope="nonSxS"
/>
<!--Define the instrumentation for Windows PowerShell-->
<!--Define the instrumentation for PowerShell-->
<instrumentation
xmlns:trace="http://schemas.microsoft.com/win/2004/08/events/trace"
xmlns:win="http://manifests.microsoft.com/win/2004/08/windows/events"
Expand Down Expand Up @@ -2210,7 +2210,7 @@
/>
</events>
<channels>
<!--There are three channels defined for Windows PowerShell instrumentation
<!--There are three channels defined for PowerShell instrumentation
event provider
1. Operational - for high level diagnostic messages
2. Analytic - for high volume high performance trace messages
Expand Down Expand Up @@ -5655,23 +5655,23 @@
/>
<string
id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_LISTENER_START.message"
value="Windows PowerShell has started an IPC listening thread on process: %1 in AppDomain: %2."
value="PowerShell has started an IPC listening thread on process: %1 in AppDomain: %2."
/>
<string
id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_LISTENER_END.message"
value="Windows PowerShell has ended an IPC listening thread on process: %1 in AppDomain: %2."
value="PowerShell has ended an IPC listening thread on process: %1 in AppDomain: %2."
/>
<string
id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_LISTENER_ERROR.message"
value="An error has occurred in Windows PowerShell IPC listening thread on process: %1 in AppDomain: %2. Error Message: %3."
value="An error has occurred in PowerShell IPC listening thread on process: %1 in AppDomain: %2. Error Message: %3."
/>
<string
id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_CONNECT.message"
value="Windows PowerShell IPC connect on process: %1 in AppDomain: %2 for User: %3."
value="PowerShell IPC connect on process: %1 in AppDomain: %2 for User: %3."
/>
<string
id="PS_PROVIDER.event.E_O_REMOTE_NAMEDPIPE_DISCONNECT.message"
value="Windows PowerShell IPC disconnect on process: %1 in AppDomain: %2 for User: %3."
value="PowerShell IPC disconnect on process: %1 in AppDomain: %2 for User: %3."
/>
</stringTable>
</resources>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/remoting/client/remoterunspace.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2531,7 +2531,7 @@ private void CheckForValidateState()
{
throw new PSInvalidOperationException(
// The remote session to which you are connected does not support remote debugging.
// You must connect to a remote computer that is running Windows PowerShell {0} or greater.
// You must connect to a remote computer that is running PowerShell {0} or greater.
StringUtil.Format(RemotingErrorIdStrings.RemoteDebuggingEndpointVersionError, PSVersionInfo.PSV4Version),
null,
"RemoteDebugger:RemoteDebuggingNotSupported",
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/remoting/common/WireDataFormat/RemoteHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ internal Collection<RemoteHostCall> PerformSecurityChecksOnHostMessage(string co

// check if the incoming message is a PromptForCredential message
// if so, do the following:
// (a) prepend "Windows PowerShell Credential Request" in the title
// (a) prepend "PowerShell Credential Request" in the title
// (b) prepend "Message from Server XXXXX" to the text message
if (MethodId == RemoteHostMethodId.PromptForCredential1 ||
MethodId == RemoteHostMethodId.PromptForCredential2)
Expand Down Expand Up @@ -436,7 +436,7 @@ internal Collection<RemoteHostCall> PerformSecurityChecksOnHostMessage(string co
/// <summary>
/// Provides the modified caption for the given caption
/// Used in ensuring that remote prompt messages are
/// tagged with "Windows PowerShell Credential Request"
/// tagged with "PowerShell Credential Request"
/// </summary>
/// <param name="caption">Caption to modify.</param>
/// <returns>New modified caption.</returns>
Expand Down
Loading