System.CommandLine is split into too many namespaces

samples/HostingPlayground/Program.cs

@@ -1,5 +1,4 @@
 using System.CommandLine;
-using System.CommandLine.Builder;
 using System.CommandLine.Hosting;
 using System.CommandLine.NamingConventionBinder;
 using Microsoft.Extensions.Hosting;

src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_Hosting_api_is_not_changed.approved.txt

@@ -1,15 +1,15 @@
-System.CommandLine.Hosting
+System.CommandLine.Hosting
   public static class DirectiveConfigurationExtensions
-    public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddCommandLineDirectives(this Microsoft.Extensions.Configuration.IConfigurationBuilder config, System.CommandLine.Parsing.ParseResult commandline, System.String name)
+    public static Microsoft.Extensions.Configuration.IConfigurationBuilder AddCommandLineDirectives(this Microsoft.Extensions.Configuration.IConfigurationBuilder config, System.CommandLine.ParseResult commandline, System.String name)
   public static class HostingExtensions
     public static OptionsBuilder<TOptions> BindCommandLine<TOptions>(this OptionsBuilder<TOptions> optionsBuilder)
     public static Microsoft.Extensions.Hosting.IHost GetHost(this System.CommandLine.Invocation.InvocationContext invocationContext)
     public static System.CommandLine.Invocation.InvocationContext GetInvocationContext(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder)
     public static System.CommandLine.Invocation.InvocationContext GetInvocationContext(this Microsoft.Extensions.Hosting.HostBuilderContext context)
     public static Microsoft.Extensions.Hosting.IHostBuilder UseCommandHandler<TCommand, THandler>(this Microsoft.Extensions.Hosting.IHostBuilder builder)
     public static Microsoft.Extensions.Hosting.IHostBuilder UseCommandHandler(this Microsoft.Extensions.Hosting.IHostBuilder builder, System.Type commandType, System.Type handlerType)
-    public static System.CommandLine.Builder.CommandLineBuilder UseHost(this System.CommandLine.Builder.CommandLineBuilder builder, System.Action<Microsoft.Extensions.Hosting.IHostBuilder> configureHost = null)
-    public static System.CommandLine.Builder.CommandLineBuilder UseHost(this System.CommandLine.Builder.CommandLineBuilder builder, System.Func<System.String[],Microsoft.Extensions.Hosting.IHostBuilder> hostBuilderFactory, System.Action<Microsoft.Extensions.Hosting.IHostBuilder> configureHost = null)
+    public static System.CommandLine.CommandLineBuilder UseHost(this System.CommandLine.CommandLineBuilder builder, System.Action<Microsoft.Extensions.Hosting.IHostBuilder> configureHost = null)
+    public static System.CommandLine.CommandLineBuilder UseHost(this System.CommandLine.CommandLineBuilder builder, System.Func<System.String[],Microsoft.Extensions.Hosting.IHostBuilder> hostBuilderFactory, System.Action<Microsoft.Extensions.Hosting.IHostBuilder> configureHost = null)
     public static Microsoft.Extensions.Hosting.IHostBuilder UseInvocationLifetime(this Microsoft.Extensions.Hosting.IHostBuilder host, System.CommandLine.Invocation.InvocationContext invocation, System.Action<InvocationLifetimeOptions> configureOptions = null)
   public class InvocationLifetime, Microsoft.Extensions.Hosting.IHostLifetime
     .ctor(Microsoft.Extensions.Options.IOptions<InvocationLifetimeOptions> options, Microsoft.Extensions.Hosting.IHostEnvironment environment, Microsoft.Extensions.Hosting.IHostApplicationLifetime applicationLifetime, System.CommandLine.Invocation.InvocationContext context = null, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory = null)

src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Directives_Suggest.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Benchmarks.Helpers;
-using System.CommandLine.Builder;
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;

src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_ParseResult.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.CommandLine.Benchmarks.Helpers;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Parsing;
 using System.Linq;
 using BenchmarkDotNet.Attributes;

src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_Simple.cs

@@ -1,5 +1,5 @@
 using BenchmarkDotNet.Attributes;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;

src/System.CommandLine.Benchmarks/CommandLine/Perf_Parser_TypoCorrection.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.CommandLine.Benchmarks.Helpers;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Parsing;
 using System.Linq;
 using System.Threading.Tasks;

src/System.CommandLine.DragonFruit.Tests/ConfigureFromMethodTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Binding;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;

src/System.CommandLine.DragonFruit/CommandLine.cs

@@ -3,7 +3,7 @@
 
 using System.Collections.Generic;
 using System.CommandLine.Binding;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.NamingConventionBinder;
 using System.CommandLine.Parsing;

src/System.CommandLine.Generator/CommandHandlerSourceGenerator.cs

@@ -11,7 +11,7 @@ namespace System.CommandLine.Generator
     [Generator]
     public class CommandHandlerSourceGenerator : ISourceGenerator
     {
-        private const string ICommandHandlerType = "System.CommandLine.Invocation.ICommandHandler";
+        private const string ICommandHandlerType = "System.CommandLine.ICommandHandler";
 
         public void Execute(GeneratorExecutionContext context)
         {

src/System.CommandLine.Generator/WellKnownTypes.cs

@@ -19,7 +19,7 @@ internal class WellKnownTypes
         public WellKnownTypes(Compilation compilation, IEqualityComparer<ISymbol?> comparer)
         {
             Console = GetType("System.CommandLine.IConsole");
-            ParseResult = GetType("System.CommandLine.Parsing.ParseResult");
+            ParseResult = GetType("System.CommandLine.ParseResult");
             InvocationContext = GetType("System.CommandLine.Invocation.InvocationContext");
             HelpBuilder = GetType("System.CommandLine.Help.HelpBuilder");
             BindingContext = GetType("System.CommandLine.Binding.BindingContext");

src/System.CommandLine.Hosting.Tests/HostingHandlerTest.cs

@@ -1,5 +1,6 @@
-using System.CommandLine.Binding;
-using System.CommandLine.Builder;
+using System.CommandLine;
+using System.CommandLine.Binding;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;

src/System.CommandLine.Hosting.Tests/HostingTests.cs

@@ -1,5 +1,5 @@
 using System.CommandLine.Binding;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Linq;

src/System.CommandLine.Hosting/HostingExtensions.cs

@@ -1,5 +1,5 @@
 using System.CommandLine.Binding;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.NamingConventionBinder;
 using System.Linq;

src/System.CommandLine.NamingConventionBinder.Tests/ModelBinderTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Binding;

src/System.CommandLine.NamingConventionBinder.Tests/ParameterBindingTests.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.CommandLine;
 using System.CommandLine.Binding;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;

src/System.CommandLine.NamingConventionBinder/DelegateHandlerDescriptor.cs

@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.CommandLine.Binding;
-using System.CommandLine.Invocation;
 using System.Linq;
 
 namespace System.CommandLine.NamingConventionBinder;

src/System.CommandLine.NamingConventionBinder/HandlerDescriptor.cs

@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.CommandLine.Binding;
-using System.CommandLine.Invocation;
 using System.Reflection;
 
 namespace System.CommandLine.NamingConventionBinder;

src/System.CommandLine.NamingConventionBinder/MethodInfoHandlerDescriptor.cs

@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.CommandLine.Binding;
-using System.CommandLine.Invocation;
 using System.Linq;
 using System.Reflection;
 

src/System.CommandLine.Rendering.Tests/TerminalModeTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;

src/System.CommandLine.Rendering.Tests/ViewRenderingTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
+
 using System.CommandLine.NamingConventionBinder;
 using System.CommandLine.Parsing;
 using System.CommandLine.Rendering.Views;

src/System.CommandLine.Rendering/CommandLineBuilderExtensions.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Binding;
-using System.CommandLine.Builder;
 using System.Linq;
 
 namespace System.CommandLine.Rendering

src/System.CommandLine.Suggest.Tests/EndToEndTestApp/Program.cs

@@ -1,6 +1,4 @@
-using System;
 using System.CommandLine;
-using System.CommandLine.Builder;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;
 

src/System.CommandLine.Suggest/SuggestionDispatcher.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;

src/System.CommandLine.Tests/CommandExtensionsTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;

src/System.CommandLine.Tests/CompletionTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
+
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
 using System.IO;

src/System.CommandLine.Tests/EnvironmentVariableDirectiveTests.cs

@@ -1,6 +1,6 @@
 using FluentAssertions;
 
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.Linq;

src/System.CommandLine.Tests/Help/HelpBuilderTests.Customization.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
+
 using System.CommandLine.Help;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;

src/System.CommandLine.Tests/Help/HelpBuilderTests.cs

@@ -3,7 +3,7 @@
 
 using FluentAssertions;
 using System.Collections.Generic;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Help;
 using System.IO;
 using System.Linq;

src/System.CommandLine.Tests/Invocation/CancelOnProcessTerminationTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;

src/System.CommandLine.Tests/Invocation/InvocationPipelineTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.CommandLine.Binding;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Help;
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;

src/System.CommandLine.Tests/Invocation/TypoCorrectionTests.cs

@@ -1,4 +1,4 @@
-using System.CommandLine.Builder;
+
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;

src/System.CommandLine.Tests/ParseDirectiveTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using FluentAssertions;
-using System.CommandLine.Builder;
+
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;

src/System.CommandLine.Tests/ParserTests.DoubleDash.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
+
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
 using FluentAssertions;

src/System.CommandLine.Tests/ParserTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
 using System.IO;

src/System.CommandLine.Tests/ResourceLocalizationTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Parsing;
 using FluentAssertions;
 using System.Linq;

src/System.CommandLine.Tests/ResponseFileTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Parsing;
 using System.CommandLine.Tests.Utility;
 using System.IO;

src/System.CommandLine.Tests/SuggestDirectiveTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
+
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;

src/System.CommandLine.Tests/TestApps/NativeAOT/Program.cs

@@ -1,6 +1,6 @@
 using System;
 using System.CommandLine;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 

src/System.CommandLine.Tests/TokenReplacementTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Parsing;
 using FluentAssertions;
 using Xunit;

src/System.CommandLine.Tests/UseExceptionHandlerTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
+
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;
 using System.Threading.Tasks;

src/System.CommandLine.Tests/UseHelpTests.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System.Collections.Generic;
-using System.CommandLine.Builder;
+
 using System.CommandLine.Help;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;

src/System.CommandLine.Tests/UseParseErrorReportingTests.cs

@@ -4,7 +4,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
+
 using System.CommandLine.Parsing;
 using FluentAssertions;
 using Xunit;

src/System.CommandLine.Tests/VersionOptionTests.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.CommandLine.Builder;
+
 using System.CommandLine.Invocation;
 using System.CommandLine.IO;
 using System.CommandLine.Parsing;

src/System.CommandLine/Builder/CommandLineBuilder.cs

@@ -7,7 +7,7 @@
 using System.CommandLine.Invocation;
 using System.CommandLine.Parsing;
 
-namespace System.CommandLine.Builder
+namespace System.CommandLine
 {
     /// <summary>
     /// Enables composition of command line configurations.