diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
index d74c15d433..7c47f44831 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddMember.cs
@@ -3,14 +3,14 @@
using System;
using System.Collections;
-using System.Collections.ObjectModel;
using System.Collections.Generic;
+using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
using System.Management.Automation;
-using System.Management.Automation.Internal;
using System.Management.Automation.Host;
+using System.Management.Automation.Internal;
using System.Reflection;
-using System.Globalization;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
index f733fa51e0..9ec1f9b032 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs
@@ -2,9 +2,8 @@
// Licensed under the MIT License.
using System;
-
-using System.Collections.Generic;
using System.Collections.Concurrent;
+using System.Collections.Generic;
using System.Collections.Immutable;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CSVCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CSVCommands.cs
index 5a2cd9e9ff..54aa81e95e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CSVCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CSVCommands.cs
@@ -10,6 +10,7 @@
using System.Linq;
using System.Management.Automation;
using System.Text;
+
using Dbg = System.Management.Automation.Diagnostics;
#pragma warning disable 1634, 1691 // Stops compiler from warning about unknown warnings
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
index 320614e7f7..da28bc658f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-SddlString.cs
@@ -5,12 +5,12 @@
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
using System.Management.Automation;
using System.Security.AccessControl;
using System.Security.Principal;
using System.Text;
-using System.ComponentModel;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-StringData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-StringData.cs
index acd3584194..d4d68dabb7 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-StringData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFrom-StringData.cs
@@ -2,8 +2,8 @@
// Licensed under the MIT License.
using System;
-using System.Management.Automation;
using System.Collections;
+using System.Management.Automation;
using System.Text.RegularExpressions;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFromMarkdownCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFromMarkdownCommand.cs
index b80c48a655..8c6678181c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFromMarkdownCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ConvertFromMarkdownCommand.cs
@@ -9,7 +9,9 @@
using System.Management.Automation.Internal;
using System.Security;
using System.Threading.Tasks;
+
using Microsoft.PowerShell.MarkdownRender;
+
using Dbg = System.Management.Automation;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
index b286d645c2..16f3004220 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/CustomSerialization.cs
@@ -1,16 +1,17 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Management.Automation.Internal;
+using System.Reflection;
+using System.Xml;
+
+using Dbg = System.Management.Automation.Diagnostics;
+
namespace System.Management.Automation
{
- using System;
- using System.Collections;
- using System.Reflection;
- using System.Xml;
- using System.Management.Automation.Internal;
- using System.Collections.Generic;
- using Dbg = System.Management.Automation.Diagnostics;
-
///
/// This class provides functionality for serializing a PSObject.
///
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
index 9282a39df0..ad9414b738 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/DebugRunspaceCommand.cs
@@ -6,10 +6,10 @@
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
-using System.Threading;
using System.Management.Automation;
-using System.Management.Automation.Runspaces;
using System.Management.Automation.Remoting.Internal;
+using System.Management.Automation.Runspaces;
+using System.Threading;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs
index f56b7bc692..9536f3d399 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ColumnInfo.cs
@@ -1,12 +1,12 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Management.Automation;
+using System.Management.Automation.Internal;
+
namespace Microsoft.PowerShell.Commands
{
- using System;
- using System.Management.Automation;
- using System.Management.Automation.Internal;
-
internal abstract class ColumnInfo
{
protected string displayName;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs
index 2fb408b13c..113ba0ffab 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ExpressionColumnInfo.cs
@@ -1,13 +1,14 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections.Generic;
+using System.Management.Automation;
+
+using Microsoft.PowerShell.Commands.Internal.Format;
+
namespace Microsoft.PowerShell.Commands
{
- using System;
- using System.Collections.Generic;
- using System.Management.Automation;
- using Microsoft.PowerShell.Commands.Internal.Format;
-
internal class ExpressionColumnInfo : ColumnInfo
{
private PSPropertyExpression _expression;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs
index cefb16e917..32a61eb1f3 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/HeaderInfo.cs
@@ -1,12 +1,12 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections.Generic;
+using System.Management.Automation;
+
namespace Microsoft.PowerShell.Commands
{
- using System;
- using System.Collections.Generic;
- using System.Management.Automation;
-
internal class HeaderInfo
{
private List _columns = new List();
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OriginalColumnInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OriginalColumnInfo.cs
index da3773e60b..5caeaf5758 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OriginalColumnInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OriginalColumnInfo.cs
@@ -1,13 +1,14 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections;
+using System.Management.Automation;
+
+using Microsoft.PowerShell.Commands.Internal.Format;
+
namespace Microsoft.PowerShell.Commands
{
- using System;
- using System.Collections;
- using System.Management.Automation;
- using Microsoft.PowerShell.Commands.Internal.Format;
-
internal class OriginalColumnInfo : ColumnInfo
{
private string _liveObjectPropertyName;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs
index 062988e786..e1c26880df 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutGridViewCommand.cs
@@ -1,17 +1,17 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-namespace Microsoft.PowerShell.Commands
-{
- using System;
- using System.Collections;
- using System.Collections.Generic;
- using System.Management.Automation;
- using System.Management.Automation.Internal;
- using System.Management.Automation.Runspaces;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Management.Automation;
+using System.Management.Automation.Internal;
+using System.Management.Automation.Runspaces;
- using Microsoft.PowerShell.Commands.Internal.Format;
+using Microsoft.PowerShell.Commands.Internal.Format;
+namespace Microsoft.PowerShell.Commands
+{
///
/// Enum for SelectionMode parameter.
///
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
index d49f589030..cefb5540e8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/OutWindowProxy.cs
@@ -1,17 +1,18 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Management.Automation;
+using System.Management.Automation.Internal;
+using System.Reflection;
+using System.Threading;
+
+using Microsoft.PowerShell.Commands.Internal.Format;
+
namespace Microsoft.PowerShell.Commands
{
- using System;
- using System.Collections.Generic;
- using System.IO;
- using System.Threading;
- using System.Reflection;
- using System.Management.Automation;
- using System.Management.Automation.Internal;
- using Microsoft.PowerShell.Commands.Internal.Format;
-
internal class OutWindowProxy : IDisposable
{
private const string OutGridViewWindowClassName = "Microsoft.Management.UI.Internal.OutGridViewWindow";
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ScalarTypeColumnInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ScalarTypeColumnInfo.cs
index 27691cba0f..75adcd3cf4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ScalarTypeColumnInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/ScalarTypeColumnInfo.cs
@@ -1,11 +1,11 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Management.Automation;
+
namespace Microsoft.PowerShell.Commands
{
- using System.Management.Automation;
- using System;
-
internal class ScalarTypeColumnInfo : ColumnInfo
{
private Type _type;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
index 72edb5f214..7dfda541d7 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/OutGridView/TableView.cs
@@ -1,16 +1,17 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Management.Automation;
+using System.Management.Automation.Internal;
+
+using Microsoft.PowerShell.Commands.Internal.Format;
+
namespace Microsoft.PowerShell.Commands
{
- using System;
- using System.Collections.Generic;
- using System.Collections.ObjectModel;
- using System.Management.Automation;
- using System.Management.Automation.Internal;
- using Microsoft.PowerShell.Commands.Internal.Format;
- using System.IO;
-
internal class TableView
{
private PSPropertyExpressionFactory _expressionFactory;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs
index b2da6495f1..4076327fe5 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/GetFormatDataCommand.cs
@@ -2,11 +2,12 @@
// Licensed under the MIT License.
using System;
-using System.Linq;
-using System.Management.Automation;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Management.Automation;
using System.Management.Automation.Runspaces;
+
using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs
index 768111dc69..91ba42aa49 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/common/WriteFormatDataCommand.cs
@@ -2,9 +2,9 @@
// Licensed under the MIT License.
using System;
-using System.Management.Automation;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
+using System.Management.Automation;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-list/Format-List.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-list/Format-List.cs
index 24bbc8c8e3..e0f5e13c71 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-list/Format-List.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-list/Format-List.cs
@@ -2,6 +2,7 @@
// Licensed under the MIT License.
using System.Management.Automation;
+
using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/format-object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/format-object.cs
index 99095c1fee..7d789539e7 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/format-object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-object/format-object.cs
@@ -2,6 +2,7 @@
// Licensed under the MIT License.
using System.Management.Automation;
+
using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs
index 1b373fa610..5c729d177a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-file/Out-File.cs
@@ -2,11 +2,12 @@
// Licensed under the MIT License.
using System;
-using System.Text;
+using System.IO;
using System.Management.Automation;
-using System.Management.Automation.Internal;
using System.Management.Automation.Host;
-using System.IO;
+using System.Management.Automation.Internal;
+using System.Text;
+
using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/out-printer.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/out-printer.cs
index df7b63cfde..b72af15c43 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/out-printer.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-printer/out-printer.cs
@@ -2,6 +2,7 @@
// Licensed under the MIT License.
using System.Management.Automation;
+
using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/out-string.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/out-string.cs
index 6a4da5c7f4..e5284986a2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/out-string.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/out-string/out-string.cs
@@ -2,9 +2,10 @@
// Licensed under the MIT License.
using System;
-using System.Text;
using System.Management.Automation;
using System.Management.Automation.Host;
+using System.Text;
+
using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-PSBreakpoint.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-PSBreakpoint.cs
index 7f91bb319f..49693b16b4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-PSBreakpoint.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Get-PSBreakpoint.cs
@@ -3,8 +3,8 @@
using System;
using System.Collections.Generic;
-using System.Management.Automation;
using System.Diagnostics.CodeAnalysis;
+using System.Management.Automation;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
index 5ad08b5ee3..e080803e39 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetAliasCommand.cs
@@ -4,9 +4,9 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.Diagnostics.CodeAnalysis;
using System.Management.Automation;
using System.Management.Automation.Internal;
-using System.Diagnostics.CodeAnalysis;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
index 6e03aab658..35634b4100 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetDateCommand.cs
@@ -3,9 +3,9 @@
using System;
using System.Globalization;
-using System.Text;
using System.Management.Automation;
using System.Management.Automation.Internal;
+using System.Text;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHash.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHash.cs
index d769d6fc0b..8825f1097e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHash.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetHash.cs
@@ -3,10 +3,10 @@
using System;
using System.Collections.Generic;
-using System.Management.Automation;
using System.Collections.ObjectModel;
-using System.Security.Cryptography;
using System.IO;
+using System.Management.Automation;
+using System.Security.Cryptography;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommand.cs
index 9453732b9d..1a7c4b1a8d 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRandomCommand.cs
@@ -8,9 +8,10 @@
using System.Management.Automation;
using System.Management.Automation.Runspaces;
using System.Numerics;
+using System.Security.Cryptography;
using System.Threading;
+
using Debug = System.Management.Automation.Diagnostics;
-using System.Security.Cryptography;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRunspaceCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRunspaceCommand.cs
index 1c5930898b..e388e6609e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRunspaceCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetRunspaceCommand.cs
@@ -6,6 +6,7 @@
using System.Diagnostics.CodeAnalysis;
using System.Management.Automation;
using System.Management.Automation.Runspaces;
+
using Dbg = System.Management.Automation.Diagnostics;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUnique.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUnique.cs
index f006e1d460..baf6f16bff 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUnique.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUnique.cs
@@ -2,9 +2,9 @@
// Licensed under the MIT License.
using System;
+using System.Globalization;
using System.Management.Automation;
using System.Management.Automation.Internal;
-using System.Globalization;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs
index 9258ec782c..0527ed8fce 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetUptime.cs
@@ -2,8 +2,8 @@
// Licensed under the MIT License.
using System;
-using System.Management.Automation;
using System.Diagnostics;
+using System.Management.Automation;
using System.Management.Automation.Internal;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs
index 238f993e2b..6b1913cc96 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/GetVerbCommand.cs
@@ -2,9 +2,9 @@
// Licensed under the MIT License.
using System;
-using System.Management.Automation;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.Management.Automation;
using System.Reflection;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
index 6d67ac61ae..3b97ecd434 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
@@ -9,15 +9,15 @@
using System.Globalization;
using System.IO;
using System.Management.Automation;
-using System.Management.Automation.Language;
using System.Management.Automation.Internal;
+using System.Management.Automation.Language;
using System.Management.Automation.Remoting;
using System.Management.Automation.Runspaces;
using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Text.RegularExpressions;
using System.Xml;
-using System.Security.Cryptography.X509Certificates;
using Dbg = System.Management.Automation.Diagnostics;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
index 92ad25620c..2087676b0e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Import-LocalizedData.cs
@@ -2,11 +2,11 @@
// Licensed under the MIT License.
using System;
+using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.IO;
-using System.Management.Automation.Internal;
using System.Management.Automation;
-using System.Diagnostics.CodeAnalysis;
+using System.Management.Automation.Internal;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MarkdownOptionCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MarkdownOptionCommands.cs
index 1109cd8846..1314620743 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MarkdownOptionCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/MarkdownOptionCommands.cs
@@ -8,6 +8,7 @@
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Threading.Tasks;
+
using Microsoft.PowerShell.MarkdownRender;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
index ba73e1021c..687b1cdc9a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Measure-Object.cs
@@ -7,6 +7,7 @@
using System.Globalization;
using System.Management.Automation;
using System.Management.Automation.Internal;
+
using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
index 0ce410f0cc..1cbbce4e28 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/NewTimeSpanCommand.cs
@@ -3,6 +3,7 @@
using System;
using System.Management.Automation;
+
using Dbg = System.Management.Automation;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs
index 95b6bb0d28..3a9a42c4b2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ObjectCommandComparer.cs
@@ -5,8 +5,8 @@
using System;
using System.Collections;
-using System.Management.Automation;
using System.Globalization;
+using System.Management.Automation;
#endregion
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
index c6194ff0ac..a7258cb1bb 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/OrderObjectBase.cs
@@ -2,13 +2,14 @@
// Licensed under the MIT License.
using System;
-using System.Collections.Generic;
using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
using System.Management.Automation;
using System.Management.Automation.Internal;
-using System.Globalization;
+
using Microsoft.PowerShell.Commands.Internal.Format;
-using System.Diagnostics.CodeAnalysis;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
index b7aac6ee84..a03adbe97f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs
@@ -8,6 +8,7 @@
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Runtime.InteropServices;
+
using Dbg = System.Management.Automation;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommand.cs
index fa163dafdf..3681de8c4a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommand.cs
@@ -1,19 +1,20 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Globalization;
+using System.Management.Automation;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+
+using Microsoft.PowerShell.Commands.ShowCommandExtension;
+
namespace Microsoft.PowerShell.Commands
{
- using System;
- using System.Collections.Generic;
- using System.Collections.ObjectModel;
- using System.Globalization;
- using System.Management.Automation;
- using System.Reflection;
- using System.Runtime.InteropServices;
- using System.Text;
- using System.Threading;
- using Microsoft.PowerShell.Commands.ShowCommandExtension;
-
///
/// Show-Command displays a GUI for a cmdlet, or for all cmdlets if no specific cmdlet is specified.
///
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandCommandInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandCommandInfo.cs
index b81997720b..7b6bb0674c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandCommandInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandCommandInfo.cs
@@ -1,13 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+
namespace Microsoft.PowerShell.Commands.ShowCommandExtension
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Management.Automation;
-
///
/// Implements a facade around CommandInfo and its deserialized counterpart.
///
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandModuleInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandModuleInfo.cs
index 788e5d4e34..9c3f97d516 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandModuleInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandModuleInfo.cs
@@ -1,11 +1,11 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Management.Automation;
+
namespace Microsoft.PowerShell.Commands.ShowCommandExtension
{
- using System;
- using System.Management.Automation;
-
///
/// Implements a facade around PSModuleInfo and its deserialized counterpart.
///
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterInfo.cs
index 06f17d171b..a7fb2664a1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterInfo.cs
@@ -1,13 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+
namespace Microsoft.PowerShell.Commands.ShowCommandExtension
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Management.Automation;
-
///
/// Implements a facade around ShowCommandParameterInfo and its deserialized counterpart.
///
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterSetInfo.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterSetInfo.cs
index 94c0656289..e9d149bfca 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterSetInfo.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterSetInfo.cs
@@ -1,13 +1,13 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+
namespace Microsoft.PowerShell.Commands.ShowCommandExtension
{
- using System;
- using System.Collections.Generic;
- using System.Linq;
- using System.Management.Automation;
-
///
/// Implements a facade around CommandParameterSetInfo and its deserialized counterpart.
///
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterType.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterType.cs
index 7345958478..3bde6cdf85 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterType.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandParameterType.cs
@@ -1,12 +1,12 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections;
+using System.Management.Automation;
+
namespace Microsoft.PowerShell.Commands.ShowCommandExtension
{
- using System;
- using System.Collections;
- using System.Management.Automation;
-
///
/// Implements a facade around ShowCommandParameterInfo and its deserialized counterpart.
///
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandProxy.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandProxy.cs
index 53f20f479f..e41c58bc2f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandProxy.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowCommand/ShowCommandProxy.cs
@@ -1,16 +1,17 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Management.Automation;
+using System.Management.Automation.Internal;
+using System.Threading;
+
+using Microsoft.PowerShell.Commands.ShowCommandExtension;
+
namespace Microsoft.PowerShell.Commands
{
- using System;
- using System.Collections.Generic;
- using System.Management.Automation;
- using System.Management.Automation.Internal;
- using System.Threading;
- using System.Collections.ObjectModel;
- using Microsoft.PowerShell.Commands.ShowCommandExtension;
-
///
/// Help show-command create WPF object and invoke WPF windows with the
/// Microsoft.PowerShell.Commands.ShowCommandInternal.ShowCommandHelperhelp type defined in Microsoft.PowerShell.GraphicalHost.dll.
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs
index 6d108395d6..beb3519713 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ShowMarkdownCommand.cs
@@ -10,6 +10,7 @@
using System.IO;
using System.Management.Automation;
using System.Management.Automation.Internal;
+
using Microsoft.PowerShell.MarkdownRender;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
index 43840141ed..cd71a988be 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/StartSleepCommand.cs
@@ -4,6 +4,7 @@
using System;
using System.Management.Automation;
using System.Threading;
+
using Dbg = System.Management.Automation;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-Data.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-Data.cs
index 6b2e83e828..a0b093cfb9 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-Data.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-Data.cs
@@ -2,8 +2,8 @@
// Licensed under the MIT License.
using System;
-using System.Management.Automation;
using System.Collections.ObjectModel;
+using System.Management.Automation;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
index 9b655c50ed..ee5f40856c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/Update-TypeData.cs
@@ -4,12 +4,13 @@
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
-using System.Globalization;
-using System.Reflection;
-using System.Management.Automation;
using System.Collections.ObjectModel;
using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Management.Automation;
using System.Management.Automation.Runspaces;
+using System.Reflection;
+
using Dbg = System.Management.Automation.Diagnostics;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs
index f8c1bd2b3d..3435a2b4bc 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/UtilityCommon.cs
@@ -2,11 +2,11 @@
// Licensed under the MIT License.
using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
using System.Management.Automation;
using System.Management.Automation.Runspaces;
using System.Text;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
[module: SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix", Scope = "type", Target = "Microsoft.PowerShell.Commands.ByteCollection")]
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
index 7685ff7c30..98d5a73d32 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/ContentHelper.Common.cs
@@ -7,6 +7,7 @@
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text;
+
using Microsoft.Win32;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
index 15e46c5f69..13a2aa4ee4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/InvokeRestMethodCommand.Common.cs
@@ -2,13 +2,14 @@
// Licensed under the MIT License.
using System;
-using System.Management.Automation;
using System.IO;
+using System.Management.Automation;
+using System.Net.Http;
+using System.Text;
using System.Xml;
+
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-using System.Net.Http;
-using System.Text;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
index 1a23725416..7a814fd6f6 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebRequestPSCmdlet.Common.cs
@@ -2,26 +2,27 @@
// Licensed under the MIT License.
using System;
+using System.Collections;
+using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.Globalization;
+using System.IO;
+using System.Linq;
using System.Management.Automation;
using System.Net;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Globalization;
+using System.Net.Http;
+using System.Net.Http.Headers;
using System.Security;
using System.Security.Authentication;
using System.Security.Cryptography;
using System.Security.Cryptography.X509Certificates;
-using Microsoft.Win32;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading;
-using System.Xml;
-using System.Collections.Generic;
+using System.Text;
using System.Text.RegularExpressions;
-using System.Linq;
+using System.Threading;
using System.Threading.Tasks;
+using System.Xml;
+
+using Microsoft.Win32;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs
index 6eaa4775d7..39ac6bdf20 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/Common/WebResponseObject.Common.cs
@@ -2,11 +2,11 @@
// Licensed under the MIT License.
using System;
+using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.IO;
-using System.Text;
using System.Net.Http;
-using System.Collections.Generic;
+using System.Text;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
index afdc300d71..f898861c9f 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/ConvertToJsonCommand.cs
@@ -7,6 +7,7 @@
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Threading;
+
using Newtonsoft.Json;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs
index 7dd9f5ab96..0a5441faef 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/InvokeWebRequestCommand.CoreClr.cs
@@ -2,9 +2,9 @@
// Licensed under the MIT License.
using System;
+using System.IO;
using System.Management.Automation;
using System.Net.Http;
-using System.IO;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseHelper.CoreClr.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseHelper.CoreClr.cs
index 47b0367f22..b61977d87e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseHelper.CoreClr.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseHelper.CoreClr.cs
@@ -3,8 +3,8 @@
using System;
using System.Collections.Generic;
-using System.Net.Http;
using System.Globalization;
+using System.Net.Http;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseObjectFactory.CoreClr.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseObjectFactory.CoreClr.cs
index bb1f9a1f48..7d9c33724b 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseObjectFactory.CoreClr.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/CoreCLR/WebResponseObjectFactory.CoreClr.cs
@@ -1,9 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
-using System.Net.Http;
using System.IO;
using System.Management.Automation;
+using System.Net.Http;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
index 8e9d63eb34..b61c0ffaf0 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/JsonObject.cs
@@ -10,6 +10,7 @@
using System.Reflection;
using System.Text.RegularExpressions;
using System.Threading;
+
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq;
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/PSUserAgent.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/PSUserAgent.cs
index e74fabb149..6478571ca1 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/PSUserAgent.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/PSUserAgent.cs
@@ -2,9 +2,9 @@
// Licensed under the MIT License.
using System;
+using System.Globalization;
using System.Management.Automation;
using System.Runtime.InteropServices;
-using System.Globalization;
using System.Text.RegularExpressions;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
index 392255c074..29f73b3f14 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/StreamHelper.cs
@@ -2,13 +2,13 @@
// Licensed under the MIT License.
using System;
-using System.Text;
-using System.Text.RegularExpressions;
using System.IO;
using System.IO.Compression;
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Net.Http;
+using System.Text;
+using System.Text.RegularExpressions;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebCmdletElementCollection.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebCmdletElementCollection.cs
index 65e578e760..340baf1855 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebCmdletElementCollection.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebCmdletElementCollection.cs
@@ -1,9 +1,9 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.
+using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Management.Automation;
-using System.Collections.Generic;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
index 3289e1c51d..384c72a521 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WebCmdlet/WebRequestSession.cs
@@ -2,8 +2,8 @@
// Licensed under the MIT License.
using System;
-using System.Net;
using System.Collections.Generic;
+using System.Net;
using System.Security.Cryptography.X509Certificates;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
index d2a8d8caaf..130f88c2a8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteAliasCommandBase.cs
@@ -3,6 +3,7 @@
using System;
using System.Management.Automation;
+
using Dbg = System.Management.Automation;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs
index b44ae5e1bc..6cbd3a00c8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/WriteConsoleCmdlet.cs
@@ -2,8 +2,8 @@
// Licensed under the MIT License.
using System;
-using System.Management.Automation;
using System.Collections;
+using System.Management.Automation;
using System.Text;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
index 11b7cd71f2..5ab2083ea3 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/XmlCommands.cs
@@ -13,6 +13,7 @@
using System.Security;
using System.Text;
using System.Xml;
+
using Dbg = System.Management.Automation.Diagnostics;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/compare-object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/compare-object.cs
index 8ac522446e..d9ad139e14 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/compare-object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/compare-object.cs
@@ -2,9 +2,10 @@
// Licensed under the MIT License.
using System;
-using System.Collections.Generic;
using System.Collections;
+using System.Collections.Generic;
using System.Management.Automation;
+
using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/convert-HTML.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/convert-HTML.cs
index 1fde5f1cf1..1374ce6aa4 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/convert-HTML.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/convert-HTML.cs
@@ -10,6 +10,7 @@
using System.Management.Automation.Internal;
using System.Net;
using System.Text;
+
using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/new-object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/new-object.cs
index 8c584cd30b..6f5f8b2f33 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/new-object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/new-object.cs
@@ -4,16 +4,17 @@
#region Using directives
using System;
-using System.Reflection;
using System.Collections;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Management.Automation;
-using System.Management.Automation.Security;
-using System.Management.Automation.Internal;
using System.Diagnostics.CodeAnalysis;
using System.Globalization;
+using System.Management.Automation;
+using System.Management.Automation.Internal;
using System.Management.Automation.Language;
+using System.Management.Automation.Security;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Threading;
+
using Dbg = System.Management.Automation.Diagnostics;
#endregion
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/select-object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/select-object.cs
index 4828a6472f..eaf065eaaf 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/select-object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/select-object.cs
@@ -3,11 +3,12 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
using System.Globalization;
using System.Management.Automation;
-using Microsoft.PowerShell.Commands.Internal.Format;
using System.Management.Automation.Internal;
-using System.Diagnostics.CodeAnalysis;
+
+using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/tee-object.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/tee-object.cs
index de68585d55..ec861aa1e3 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/tee-object.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/tee-object.cs
@@ -3,6 +3,7 @@
using System;
using System.Management.Automation;
+
using Microsoft.PowerShell.Commands.Internal.Format;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
index d8bac76f0a..c95c9793be 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/MshHostTraceListener.cs
@@ -2,10 +2,10 @@
// Licensed under the MIT License.
using System;
-using System.Text;
-using System.Security.Permissions;
using System.Management.Automation;
using System.Management.Automation.Internal.Host;
+using System.Security.Permissions;
+using System.Text;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceCommandBase.cs
index 1a07f9a933..87fa21d3b8 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceCommandBase.cs
@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Management.Automation;
+
using Dbg = System.Management.Automation.Diagnostics;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
index e5dbcac8a6..3eec497c0c 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceExpressionCommand.cs
@@ -9,6 +9,7 @@
using System.Management.Automation.Internal;
using System.Management.Automation.Runspaces;
using System.Threading;
+
using Dbg = System.Management.Automation.Diagnostics;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
index 89f696f2f4..31a6845c0e 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/trace/TraceListenerCommandBase.cs
@@ -9,6 +9,7 @@
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Security;
+
using Dbg = System.Management.Automation.Diagnostics;
namespace Microsoft.PowerShell.Commands
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/update-list.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/update-list.cs
index addfcf7c59..9ba6c89802 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/update-list.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/update-list.cs
@@ -3,8 +3,8 @@
using System;
using System.Collections;
-using System.Management.Automation;
using System.Diagnostics.CodeAnalysis;
+using System.Management.Automation;
namespace Microsoft.PowerShell.Commands
{
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/write.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/write.cs
index 3518eabc39..b2bc452d9a 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/write.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/write.cs
@@ -2,10 +2,10 @@
// Licensed under the MIT License.
using System;
+using System.Diagnostics.CodeAnalysis;
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Runtime.Serialization;
-using System.Diagnostics.CodeAnalysis;
namespace Microsoft.PowerShell.Commands
{