diff --git a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs index 4fa6878778..0400d3488b 100644 --- a/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs +++ b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs @@ -738,7 +738,7 @@ namespace System.Management.Automation.Runspaces "System.Management.Automation.Subsystem.SubsystemInfo", TableControl.Create() .AddHeader(Alignment.Left, width: 17, label: "Kind") - .AddHeader(Alignment.Left, width: 15, label: "SubsystemType") + .AddHeader(Alignment.Left, width: 18, label: "SubsystemType") .AddHeader(Alignment.Right, width: 12, label: "IsRegistered") .AddHeader(Alignment.Left, label: "Implementations") .StartRowDefinition() diff --git a/src/System.Management.Automation/engine/InitialSessionState.cs b/src/System.Management.Automation/engine/InitialSessionState.cs index c284c66e2e..a83aa1d3c5 100644 --- a/src/System.Management.Automation/engine/InitialSessionState.cs +++ b/src/System.Management.Automation/engine/InitialSessionState.cs @@ -5395,7 +5395,7 @@ end { if (ExperimentalFeature.IsEnabled("PSSubsystemPluginModel")) { - cmdlets.Add("Get-Subsystem", new SessionStateCmdletEntry("Get-Subsystem", typeof(Subsystem.GetSubsystemCommand), helpFile)); + cmdlets.Add("Get-PSSubsystem", new SessionStateCmdletEntry("Get-PSSubsystem", typeof(Subsystem.GetPSSubsystemCommand), helpFile)); } foreach (var val in cmdlets.Values) diff --git a/src/System.Management.Automation/engine/Subsystem/Commands/GetSubsystemCommand.cs b/src/System.Management.Automation/engine/Subsystem/Commands/GetPSSubsystemCommand.cs similarity index 88% rename from src/System.Management.Automation/engine/Subsystem/Commands/GetSubsystemCommand.cs rename to src/System.Management.Automation/engine/Subsystem/Commands/GetPSSubsystemCommand.cs index 666cf9c556..1ad79404f5 100644 --- a/src/System.Management.Automation/engine/Subsystem/Commands/GetSubsystemCommand.cs +++ b/src/System.Management.Automation/engine/Subsystem/Commands/GetPSSubsystemCommand.cs @@ -6,12 +6,12 @@ namespace System.Management.Automation.Subsystem { /// - /// Implementation of 'Get-Subsystem' cmdlet. + /// Implementation of 'Get-PSSubsystem' cmdlet. /// [Experimental("PSSubsystemPluginModel", ExperimentAction.Show)] - [Cmdlet(VerbsCommon.Get, "Subsystem", DefaultParameterSetName = AllSet)] + [Cmdlet(VerbsCommon.Get, "PSSubsystem", DefaultParameterSetName = AllSet)] [OutputType(typeof(SubsystemInfo))] - public sealed class GetSubsystemCommand : PSCmdlet + public sealed class GetPSSubsystemCommand : PSCmdlet { private const string AllSet = "GetAllSet"; private const string TypeSet = "GetByTypeSet"; @@ -37,7 +37,7 @@ namespace System.Management.Automation.Subsystem switch (ParameterSetName) { case AllSet: - WriteObject(SubsystemManager.GetAllSubsystemInfo()); + WriteObject(SubsystemManager.GetAllSubsystemInfo(), enumerateCollection: true); break; case KindSet: WriteObject(SubsystemManager.GetSubsystemInfo(Kind)); diff --git a/test/powershell/engine/Help/HelpSystem.Tests.ps1 b/test/powershell/engine/Help/HelpSystem.Tests.ps1 index d3c508fe40..3fbd082235 100644 --- a/test/powershell/engine/Help/HelpSystem.Tests.ps1 +++ b/test/powershell/engine/Help/HelpSystem.Tests.ps1 @@ -16,7 +16,7 @@ $script:cmdletsToSkip = @( "Get-ExperimentalFeature", "Enable-ExperimentalFeature", "Disable-ExperimentalFeature", - "Get-Subsystem" + "Get-PSSubsystem" ) function UpdateHelpFromLocalContentPath {