Clean up extensions for dotnet CLI & Utils

src/BuiltInTools/dotnet-watch/CommandLineOptions.cs

@@ -8,6 +8,7 @@
 using System.Data;
 using System.Diagnostics;
 using Microsoft.DotNet.Cli;
+using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Tools.Run;
 using NuGet.Common;
 

src/Cli/Microsoft.DotNet.Cli.Utils/Command.cs

@@ -3,6 +3,7 @@
 
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 
 namespace Microsoft.DotNet.Cli.Utils
 {

src/Cli/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.DotNet.Cli.Utils.Extensions;
+
 namespace Microsoft.DotNet.Cli.Utils
 {
     public class EnvironmentProvider : IEnvironmentProvider

src/Cli/Microsoft.DotNet.Cli.Utils/AnsiExtensions.cs → src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/AnsiExtensions.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.DotNet.Cli.Utils
+namespace Microsoft.DotNet.Cli.Utils.Extensions
 {
     public static class AnsiExtensions
     {

src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/CollectionsExtensions.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.DotNet.Cli.Utils
+namespace Microsoft.DotNet.Cli.Utils.Extensions
 {
     public static class CollectionsExtensions
     {

src/Cli/Microsoft.DotNet.Cli.Utils/ExceptionExtensions.cs → src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ExceptionExtensions.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-namespace Microsoft.DotNet.Cli.Utils
+namespace Microsoft.DotNet.Cli.Utils.Extensions
 {
     internal static class ExceptionExtensions
     {

src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/LockFileExtensions.cs

@@ -5,9 +5,9 @@
 using NuGet.Packaging;
 using NuGet.ProjectModel;
 
-namespace Microsoft.DotNet.Cli.Utils
+namespace Microsoft.DotNet.Cli.Utils.Extensions
 {
-    static class LockFileExtensions
+    internal static class LockFileExtensions
     {
         public static string GetPackageDirectory(this LockFile lockFile, LockFileTargetLibrary library)
         {

src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/LockFileFormatExtensions.cs

@@ -4,7 +4,7 @@
 using NuGet.Common;
 using NuGet.ProjectModel;
 
-namespace Microsoft.DotNet.Cli.Utils
+namespace Microsoft.DotNet.Cli.Utils.Extensions
 {
     public static class LockFileFormatExtensions
     {

src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildProjectExtensions.cs → src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/MSBuildProjectExtensions.cs

@@ -4,7 +4,7 @@
 using Microsoft.Build.Construction;
 using Microsoft.DotNet.Tools.Common;
 
-namespace Microsoft.DotNet.Cli.Utils
+namespace Microsoft.DotNet.Cli.Utils.Extensions
 {
     internal static class MSBuildProjectExtensions
     {
@@ -47,7 +47,7 @@ public static ISet<string> ConditionChain(this ProjectElement projectElement)
 
         public static ProjectItemGroupElement FindUniformOrCreateItemGroupWithCondition(this ProjectRootElement root, string projectItemElementType, string framework)
         {
-            var lastMatchingItemGroup = FindExistingUniformItemGroupWithCondition(root, projectItemElementType, framework);
+            var lastMatchingItemGroup = root.FindExistingUniformItemGroupWithCondition(projectItemElementType, framework);
 
             if (lastMatchingItemGroup != null)
             {

src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessExtensions.cs

@@ -5,7 +5,7 @@
 using System.Runtime.Versioning;
 using Microsoft.Win32.SafeHandles;
 
-namespace Microsoft.DotNet.Cli.Utils
+namespace Microsoft.DotNet.Cli.Utils.Extensions
 {
     /// <summary>
     /// Extensions methods for <see cref="Process"/> components.

src/Cli/Microsoft.DotNet.Cli.Utils/ProcessStartInfoExtensions.cs → src/Cli/Microsoft.DotNet.Cli.Utils/Extensions/ProcessStartInfoExtensions.cs

@@ -3,7 +3,7 @@
 
 using System.Diagnostics;
 
-namespace Microsoft.DotNet.Cli.Utils
+namespace Microsoft.DotNet.Cli.Utils.Extensions
 {
     internal static class ProcessStartInfoExtensions
     {

src/Cli/Microsoft.DotNet.Cli.Utils/ForwardingAppImplementation.cs

@@ -4,6 +4,7 @@
 #if NET
 
 using System.Diagnostics;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 
 namespace Microsoft.DotNet.Cli.Utils
 {

src/Cli/Microsoft.DotNet.Cli.Utils/GracefulException.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.DotNet.Cli.Utils.Extensions;
+
 namespace Microsoft.DotNet.Cli.Utils
 {
     public class GracefulException : Exception

src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs

@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 
 namespace Microsoft.DotNet.Cli.Utils
 {

src/Cli/Microsoft.DotNet.Configurer/CliFolderPathCalculator.cs

@@ -1,7 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using NuGet.Common;
 
 namespace Microsoft.DotNet.Configurer

src/Cli/Microsoft.TemplateEngine.Cli/Commands/BaseCommand.cs

@@ -6,6 +6,7 @@
 using System.CommandLine.Invocation;
 using System.Reflection;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Abstractions.Mount;
 using Microsoft.TemplateEngine.Cli.TabularOutput;

src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.NoMatchHandling.cs

@@ -3,6 +3,7 @@
 
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Edge.Settings;
 using Command = System.CommandLine.CliCommand;

src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.cs

@@ -3,6 +3,7 @@
 
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.Extensions.Logging;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Abstractions.TemplatePackage;

src/Cli/Microsoft.TemplateEngine.Cli/PostActionDispatcher.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Cli.PostActionProcessors;
 using Microsoft.TemplateEngine.Edge.Template;

src/Cli/Microsoft.TemplateEngine.Cli/PostActionProcessors/InstructionDisplayPostActionProcessor.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.TemplateEngine.Abstractions;
 
 namespace Microsoft.TemplateEngine.Cli.PostActionProcessors

src/Cli/Microsoft.TemplateEngine.Cli/TemplateInvoker.cs

@@ -3,6 +3,7 @@
 
 using System.Text.RegularExpressions;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Abstractions.TemplatePackage;
 using Microsoft.TemplateEngine.Cli.Commands;

src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Cli.Commands;
 using Microsoft.TemplateEngine.Cli.TabularOutput;

src/Cli/Microsoft.TemplateEngine.Cli/TemplatePackageCoordinator.cs

@@ -3,6 +3,7 @@
 
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.DotNet.Tools.Common;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Abstractions.Constraints;

src/Cli/Microsoft.TemplateEngine.Cli/TemplatePackageDisplay.cs

@@ -3,6 +3,7 @@
 
 using System.CommandLine;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Abstractions.Constraints;
 using Microsoft.TemplateEngine.Abstractions.Installer;

src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Abstractions.TemplatePackage;
 using Microsoft.TemplateEngine.Cli.Commands;

src/Cli/dotnet/BuildServer/BuildServerProvider.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.DotNet.Configurer;
 using Microsoft.Extensions.EnvironmentAbstractions;
 

src/Cli/dotnet/CommandBase.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
+using Microsoft.DotNet.Cli.Extensions;
 
 namespace Microsoft.DotNet.Cli
 {

src/Cli/dotnet/CommandFactory/CommandResolution/AbstractPathBasedCommandResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 
 namespace Microsoft.DotNet.CommandFactory
 {

src/Cli/dotnet/CommandFactory/CommandResolution/AppBaseDllCommandResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 
 namespace Microsoft.DotNet.CommandFactory
 {

src/Cli/dotnet/CommandFactory/CommandResolution/DepsJsonCommandResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.DotNet.Tools.Common;
 using Microsoft.Extensions.DependencyModel;
 

src/Cli/dotnet/CommandFactory/CommandResolution/MSBuildProject.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.Build.Evaluation;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using NuGet.Frameworks;
 using NuGet.ProjectModel;
 

src/Cli/dotnet/CommandFactory/CommandResolution/MuxerCommandResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 
 namespace Microsoft.DotNet.CommandFactory
 {

src/Cli/dotnet/CommandFactory/CommandResolution/OutputPathCommandResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using NuGet.Frameworks;
 
 namespace Microsoft.DotNet.CommandFactory

src/Cli/dotnet/CommandFactory/CommandResolution/PackagedCommandSpecFactory.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using Microsoft.DotNet.Tools.Common;
 using NuGet.ProjectModel;
 

src/Cli/dotnet/CommandFactory/CommandResolution/ProjectDependenciesCommandResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using NuGet.Frameworks;
 using NuGet.ProjectModel;
 

src/Cli/dotnet/CommandFactory/CommandResolution/ProjectFactory.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.Build.Exceptions;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using NuGet.Frameworks;
 
 namespace Microsoft.DotNet.CommandFactory

src/Cli/dotnet/CommandFactory/CommandResolution/ProjectPathCommandResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 
 namespace Microsoft.DotNet.CommandFactory
 {

src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 using NuGet.Frameworks;
 using NuGet.ProjectModel;
 using NuGet.Versioning;

src/Cli/dotnet/CommandFactory/CommandResolution/PublishedPathCommandResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 
 namespace Microsoft.DotNet.CommandFactory
 {

src/Cli/dotnet/CommandFactory/CommandResolution/RootedCommandResolver.cs

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Cli.Utils.Extensions;
 
 namespace Microsoft.DotNet.CommandFactory
 {

src/Cli/dotnet/CommonOptions.cs

@@ -5,6 +5,7 @@
 using System.CommandLine.Completions;
 using System.CommandLine.Parsing;
 using System.CommandLine.StaticCompletions;
+using Microsoft.DotNet.Cli.Extensions;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Tools;
 using Microsoft.DotNet.Tools.Common;

src/Cli/dotnet/CommonOptionsExtension.cs → src/Cli/dotnet/Extensions/CommonOptionsExtensions.cs

@@ -4,9 +4,9 @@
 using Microsoft.Build.Framework;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.DotNet.Cli
+namespace Microsoft.DotNet.Cli.Extensions
 {
-    internal static class CommonOptionsExtension
+    internal static class CommonOptionsExtensions
     {
         public static LoggerVerbosity ToLoggerVerbosity(this VerbosityOptions verbosityOptions)
         {