From 237ccbdf6dbfbe5a24064696d40059343d889934 Mon Sep 17 00:00:00 2001 From: Jason Shirk Date: Thu, 2 Nov 2017 07:56:24 -0700 Subject: [PATCH] Use wider columns for process id and user (#5303) I also moved all the formatting code higher up in the tree, it never felt like it belonged where it was. --- .../DefaultFormatters/Certificate_format_ps1xml.cs | 0 .../DefaultFormatters/Diagnostics_Format_ps1xml.cs | 0 .../DefaultFormatters/DotNetTypes_format_ps1xml.cs | 6 +++--- .../DefaultFormatters/Event_Format_ps1xml.cs | 0 .../DefaultFormatters/FileSystem_format_ps1xml.cs | 0 .../DefaultFormatters/HelpV3_format_ps1xml.cs | 0 .../DefaultFormatters/Help_format_ps1xml.cs | 0 .../DefaultFormatters/PowerShellCore_format_ps1xml.cs | 0 .../DefaultFormatters/PowerShellTrace_format_ps1xml.cs | 0 .../DefaultFormatters/Registry_format_ps1xml.cs | 0 .../DefaultFormatters/WSMan_Format_ps1xml.cs | 0 .../utility => }/FormatAndOutput/common/BaseCommand.cs | 0 .../FormatAndOutput/common/BaseFormattingCommand.cs | 0 .../common/BaseFormattingCommandParameters.cs | 0 .../FormatAndOutput/common/BaseOutputtingCommand.cs | 0 .../FormatAndOutput/common/ColumnWidthManager.cs | 0 .../utility => }/FormatAndOutput/common/ComplexWriter.cs | 0 .../FormatAndOutput/common/DisplayDatabase/FormatTable.cs | 0 .../FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs | 0 .../FormatAndOutput/common/DisplayDatabase/commands.cs | 0 .../common/DisplayDatabase/displayDescriptionData.cs | 0 .../common/DisplayDatabase/displayDescriptionDataMethods.cs | 0 .../DisplayDatabase/displayDescriptionData_Complex.cs | 0 .../common/DisplayDatabase/displayDescriptionData_List.cs | 0 .../common/DisplayDatabase/displayDescriptionData_Misc.cs | 0 .../common/DisplayDatabase/displayDescriptionData_Table.cs | 0 .../common/DisplayDatabase/displayDescriptionData_Wide.cs | 0 .../common/DisplayDatabase/displayResourceManagerCache.cs | 0 .../common/DisplayDatabase/typeDataManager.cs | 0 .../FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs | 0 .../common/DisplayDatabase/typeDataXmlLoader.cs | 0 .../common/DisplayDatabase/typeDataXmlLoader_Complex.cs | 0 .../common/DisplayDatabase/typeDataXmlLoader_List.cs | 0 .../common/DisplayDatabase/typeDataXmlLoader_Table.cs | 0 .../common/DisplayDatabase/typeDataXmlLoader_Views.cs | 0 .../common/DisplayDatabase/typeDataXmlLoader_Wide.cs | 0 .../FormatAndOutput/common/FormatGroupManager.cs | 0 .../FormatAndOutput/common/FormatMsgCtxManager.cs | 0 .../FormatAndOutput/common/FormatViewGenerator.cs | 0 .../FormatAndOutput/common/FormatViewGenerator_Complex.cs | 0 .../FormatAndOutput/common/FormatViewGenerator_List.cs | 0 .../FormatAndOutput/common/FormatViewGenerator_Table.cs | 0 .../FormatAndOutput/common/FormatViewGenerator_Wide.cs | 0 .../FormatAndOutput/common/FormatViewManager.cs | 0 .../utility => }/FormatAndOutput/common/FormatXMLWriter.cs | 0 .../FormatAndOutput/common/FormattingObjects.cs | 0 .../FormatAndOutput/common/FormattingObjectsDeserializer.cs | 0 .../utility => }/FormatAndOutput/common/ILineOutput.cs | 0 .../utility => }/FormatAndOutput/common/ListWriter.cs | 0 .../utility => }/FormatAndOutput/common/OutputManager.cs | 0 .../utility => }/FormatAndOutput/common/OutputQueue.cs | 0 .../utility => }/FormatAndOutput/common/TableWriter.cs | 0 .../FormatAndOutput/common/Utilities/MshObjectUtil.cs | 0 .../FormatAndOutput/common/Utilities/MshParameter.cs | 0 .../common/Utilities/MshParameterAssociation.cs | 0 .../FormatAndOutput/common/Utilities/Mshexpression.cs | 0 .../FormatAndOutput/format-default/format-default.cs | 0 .../FormatAndOutput/out-console/ConsoleLineOutput.cs | 0 .../utility => }/FormatAndOutput/out-console/OutConsole.cs | 0 .../FormatAndOutput/out-textInterface/OutTextInterface.cs | 0 60 files changed, 3 insertions(+), 3 deletions(-) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/Certificate_format_ps1xml.cs (100%) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/Diagnostics_Format_ps1xml.cs (100%) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/DotNetTypes_format_ps1xml.cs (99%) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/Event_Format_ps1xml.cs (100%) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/FileSystem_format_ps1xml.cs (100%) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/HelpV3_format_ps1xml.cs (100%) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/Help_format_ps1xml.cs (100%) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/PowerShellCore_format_ps1xml.cs (100%) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/PowerShellTrace_format_ps1xml.cs (100%) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/Registry_format_ps1xml.cs (100%) rename src/System.Management.Automation/{commands/utility/FormatAndOutput/common => FormatAndOutput}/DefaultFormatters/WSMan_Format_ps1xml.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/BaseCommand.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/BaseFormattingCommand.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/BaseFormattingCommandParameters.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/BaseOutputtingCommand.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/ColumnWidthManager.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/ComplexWriter.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/FormatTable.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/commands.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/displayDescriptionDataMethods.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Complex.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_List.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Misc.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Table.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Wide.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/typeDataManager.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Complex.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_List.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Table.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Views.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Wide.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormatGroupManager.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormatMsgCtxManager.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormatViewGenerator.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormatViewGenerator_Complex.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormatViewGenerator_List.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormatViewGenerator_Table.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormatViewGenerator_Wide.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormatViewManager.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormatXMLWriter.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormattingObjects.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/FormattingObjectsDeserializer.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/ILineOutput.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/ListWriter.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/OutputManager.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/OutputQueue.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/TableWriter.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/Utilities/MshObjectUtil.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/Utilities/MshParameter.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/Utilities/MshParameterAssociation.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/common/Utilities/Mshexpression.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/format-default/format-default.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/out-console/ConsoleLineOutput.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/out-console/OutConsole.cs (100%) rename src/System.Management.Automation/{commands/utility => }/FormatAndOutput/out-textInterface/OutTextInterface.cs (100%) diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/Certificate_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Certificate_format_ps1xml.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/Certificate_format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Certificate_format_ps1xml.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/Diagnostics_Format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Diagnostics_Format_ps1xml.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/Diagnostics_Format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Diagnostics_Format_ps1xml.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/DotNetTypes_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/DotNetTypes_format_ps1xml.cs similarity index 99% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/DotNetTypes_format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/DotNetTypes_format_ps1xml.cs index c1be08d425..b1dd1c8374 100644 --- a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/DotNetTypes_format_ps1xml.cs +++ b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/DotNetTypes_format_ps1xml.cs @@ -537,7 +537,7 @@ namespace System.Management.Automation.Runspaces .AddHeader(Alignment.Right, label: "PM(M)", width: 8) .AddHeader(Alignment.Right, label: "WS(M)", width: 10) .AddHeader(Alignment.Right, label: "CPU(s)", width: 10) - .AddHeader(Alignment.Right, width: 6) + .AddHeader(Alignment.Right, width: 7) .AddHeader(Alignment.Right, width: 3) .AddHeader() .StartRowDefinition() @@ -587,8 +587,8 @@ namespace System.Management.Automation.Runspaces TableControl.Create() .AddHeader(Alignment.Right, label: "WS(M)", width: 10) .AddHeader(Alignment.Right, label: "CPU(s)", width: 8) - .AddHeader(Alignment.Right, width: 6) - .AddHeader(width: 22) + .AddHeader(Alignment.Right, width: 7) + .AddHeader(width: 30) .AddHeader() .StartRowDefinition() .AddScriptBlockColumn("\"{0:N2}\" -f [float]($_.WS / 1MB)") diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/Event_Format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Event_Format_ps1xml.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/Event_Format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Event_Format_ps1xml.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/FileSystem_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/FileSystem_format_ps1xml.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/FileSystem_format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/FileSystem_format_ps1xml.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/HelpV3_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/HelpV3_format_ps1xml.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/HelpV3_format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/HelpV3_format_ps1xml.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/Help_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Help_format_ps1xml.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/Help_format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Help_format_ps1xml.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/PowerShellCore_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/PowerShellCore_format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellCore_format_ps1xml.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/PowerShellTrace_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellTrace_format_ps1xml.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/PowerShellTrace_format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/PowerShellTrace_format_ps1xml.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/Registry_format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Registry_format_ps1xml.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/Registry_format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/Registry_format_ps1xml.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/WSMan_Format_ps1xml.cs b/src/System.Management.Automation/FormatAndOutput/DefaultFormatters/WSMan_Format_ps1xml.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DefaultFormatters/WSMan_Format_ps1xml.cs rename to src/System.Management.Automation/FormatAndOutput/DefaultFormatters/WSMan_Format_ps1xml.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/BaseCommand.cs b/src/System.Management.Automation/FormatAndOutput/common/BaseCommand.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/BaseCommand.cs rename to src/System.Management.Automation/FormatAndOutput/common/BaseCommand.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/BaseFormattingCommand.cs b/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/BaseFormattingCommand.cs rename to src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommand.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/BaseFormattingCommandParameters.cs b/src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommandParameters.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/BaseFormattingCommandParameters.cs rename to src/System.Management.Automation/FormatAndOutput/common/BaseFormattingCommandParameters.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/BaseOutputtingCommand.cs b/src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/BaseOutputtingCommand.cs rename to src/System.Management.Automation/FormatAndOutput/common/BaseOutputtingCommand.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/ColumnWidthManager.cs b/src/System.Management.Automation/FormatAndOutput/common/ColumnWidthManager.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/ColumnWidthManager.cs rename to src/System.Management.Automation/FormatAndOutput/common/ColumnWidthManager.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/ComplexWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/ComplexWriter.cs rename to src/System.Management.Automation/FormatAndOutput/common/ComplexWriter.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/FormatTable.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/FormatTable.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/FormatTable.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/FormatTable.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/XmlLoaderBase.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/commands.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/commands.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/commands.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/commands.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionDataMethods.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionDataMethods.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionDataMethods.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionDataMethods.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Complex.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Complex.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Complex.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Complex.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_List.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_List.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_List.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_List.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Misc.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Misc.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Misc.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Misc.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Table.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Table.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Table.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Table.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Wide.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Wide.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Wide.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayDescriptionData_Wide.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/displayResourceManagerCache.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataManager.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataManager.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataManager.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataManager.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataQuery.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Complex.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Complex.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Complex.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Complex.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_List.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_List.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_List.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_List.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Table.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Table.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Table.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Table.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Views.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Views.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Views.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Views.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Wide.cs b/src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Wide.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Wide.cs rename to src/System.Management.Automation/FormatAndOutput/common/DisplayDatabase/typeDataXmlLoader_Wide.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatGroupManager.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatGroupManager.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatGroupManager.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormatGroupManager.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatMsgCtxManager.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatMsgCtxManager.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatMsgCtxManager.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormatMsgCtxManager.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewGenerator.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewGenerator.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewGenerator_Complex.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewGenerator_Complex.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Complex.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewGenerator_List.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_List.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewGenerator_List.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_List.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewGenerator_Table.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewGenerator_Table.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Table.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewGenerator_Wide.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Wide.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewGenerator_Wide.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormatViewGenerator_Wide.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewManager.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatViewManager.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatViewManager.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormatViewManager.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatXMLWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/FormatXMLWriter.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormatXMLWriter.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormatXMLWriter.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormattingObjects.cs b/src/System.Management.Automation/FormatAndOutput/common/FormattingObjects.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormattingObjects.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormattingObjects.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormattingObjectsDeserializer.cs b/src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/FormattingObjectsDeserializer.cs rename to src/System.Management.Automation/FormatAndOutput/common/FormattingObjectsDeserializer.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/ILineOutput.cs b/src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/ILineOutput.cs rename to src/System.Management.Automation/FormatAndOutput/common/ILineOutput.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/ListWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/ListWriter.cs rename to src/System.Management.Automation/FormatAndOutput/common/ListWriter.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/OutputManager.cs b/src/System.Management.Automation/FormatAndOutput/common/OutputManager.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/OutputManager.cs rename to src/System.Management.Automation/FormatAndOutput/common/OutputManager.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/OutputQueue.cs b/src/System.Management.Automation/FormatAndOutput/common/OutputQueue.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/OutputQueue.cs rename to src/System.Management.Automation/FormatAndOutput/common/OutputQueue.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/TableWriter.cs b/src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/TableWriter.cs rename to src/System.Management.Automation/FormatAndOutput/common/TableWriter.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/Utilities/MshObjectUtil.cs b/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/Utilities/MshObjectUtil.cs rename to src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/Utilities/MshParameter.cs b/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshParameter.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/Utilities/MshParameter.cs rename to src/System.Management.Automation/FormatAndOutput/common/Utilities/MshParameter.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/Utilities/MshParameterAssociation.cs b/src/System.Management.Automation/FormatAndOutput/common/Utilities/MshParameterAssociation.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/Utilities/MshParameterAssociation.cs rename to src/System.Management.Automation/FormatAndOutput/common/Utilities/MshParameterAssociation.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/common/Utilities/Mshexpression.cs b/src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/common/Utilities/Mshexpression.cs rename to src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/format-default/format-default.cs b/src/System.Management.Automation/FormatAndOutput/format-default/format-default.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/format-default/format-default.cs rename to src/System.Management.Automation/FormatAndOutput/format-default/format-default.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/out-console/ConsoleLineOutput.cs b/src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/out-console/ConsoleLineOutput.cs rename to src/System.Management.Automation/FormatAndOutput/out-console/ConsoleLineOutput.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/out-console/OutConsole.cs b/src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/out-console/OutConsole.cs rename to src/System.Management.Automation/FormatAndOutput/out-console/OutConsole.cs diff --git a/src/System.Management.Automation/commands/utility/FormatAndOutput/out-textInterface/OutTextInterface.cs b/src/System.Management.Automation/FormatAndOutput/out-textInterface/OutTextInterface.cs similarity index 100% rename from src/System.Management.Automation/commands/utility/FormatAndOutput/out-textInterface/OutTextInterface.cs rename to src/System.Management.Automation/FormatAndOutput/out-textInterface/OutTextInterface.cs