Move System.CommandLine.Builder to System.CommandLine

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,4 +1,4 @@
-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 class HostingExtensions
@@ -8,8 +8,8 @@
     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.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt

@@ -1,4 +1,4 @@
-System.CommandLine
+System.CommandLine
   public abstract class Argument : Symbol, System.CommandLine.Binding.IValueDescriptor, System.CommandLine.Completions.ICompletionSource
     public ArgumentArity Arity { get; set; }
     public CompletionSourceList Completions { get; }
@@ -70,6 +70,33 @@
     public static System.Threading.Tasks.Task<System.Int32> InvokeAsync(this Command command, System.String commandLine, IConsole console = null)
     public static System.CommandLine.Parsing.ParseResult Parse(this Command command, System.String[] args)
     public static System.CommandLine.Parsing.ParseResult Parse(this Command command, System.String commandLine)
+  public class CommandLineBuilder
+    .ctor(Command rootCommand = null)
+    public Command Command { get; }
+    public System.CommandLine.Parsing.Parser Build()
+  public static class CommandLineBuilderExtensions
+    public static CommandLineBuilder AddMiddleware(this CommandLineBuilder builder, System.CommandLine.Invocation.InvocationMiddleware middleware, System.CommandLine.Invocation.MiddlewareOrder order = Default)
+    public static CommandLineBuilder AddMiddleware(this CommandLineBuilder builder, System.Action<System.CommandLine.Invocation.InvocationContext> onInvoke, System.CommandLine.Invocation.MiddlewareOrder order = Default)
+    public static CommandLineBuilder CancelOnProcessTermination(this CommandLineBuilder builder, System.Nullable<System.TimeSpan> timeout = null)
+    public static CommandLineBuilder EnableDirectives(this CommandLineBuilder builder, System.Boolean value = True)
+    public static CommandLineBuilder EnableLegacyDoubleDashBehavior(this CommandLineBuilder builder, System.Boolean value = True)
+    public static CommandLineBuilder EnablePosixBundling(this CommandLineBuilder builder, System.Boolean value = True)
+    public static CommandLineBuilder RegisterWithDotnetSuggest(this CommandLineBuilder builder)
+    public static CommandLineBuilder UseDefaults(this CommandLineBuilder builder)
+    public static CommandLineBuilder UseEnvironmentVariableDirective(this CommandLineBuilder builder)
+    public static CommandLineBuilder UseExceptionHandler(this CommandLineBuilder builder, System.Action<System.Exception,System.CommandLine.Invocation.InvocationContext> onException = null, System.Nullable<System.Int32> errorExitCode = null)
+    public static CommandLineBuilder UseHelp(this CommandLineBuilder builder, System.Nullable<System.Int32> maxWidth = null)
+    public static CommandLineBuilder UseHelp(this CommandLineBuilder builder, System.String[] helpAliases)
+    public static CommandLineBuilder UseHelp(this CommandLineBuilder builder, System.Action<System.CommandLine.Help.HelpContext> customize, System.Nullable<System.Int32> maxWidth = null)
+    public static TBuilder UseHelpBuilder<TBuilder>(this TBuilder builder, System.Func<System.CommandLine.Binding.BindingContext,System.CommandLine.Help.HelpBuilder> getHelpBuilder)
+    public static CommandLineBuilder UseLocalizationResources(this CommandLineBuilder builder, LocalizationResources validationMessages)
+    public static CommandLineBuilder UseParseDirective(this CommandLineBuilder builder, System.Nullable<System.Int32> errorExitCode = null)
+    public static CommandLineBuilder UseParseErrorReporting(this CommandLineBuilder builder, System.Nullable<System.Int32> errorExitCode = null)
+    public static CommandLineBuilder UseSuggestDirective(this CommandLineBuilder builder)
+    public static CommandLineBuilder UseTokenReplacer(this CommandLineBuilder builder, System.CommandLine.Parsing.TryReplaceToken replaceToken)
+    public static CommandLineBuilder UseTypoCorrections(this CommandLineBuilder builder, System.Int32 maxLevenshteinDistance = 3)
+    public static CommandLineBuilder UseVersionOption(this CommandLineBuilder builder)
+    public static CommandLineBuilder UseVersionOption(this CommandLineBuilder builder, System.String[] aliases)
   public class CommandLineConfiguration
     .ctor(Command command, System.Boolean enablePosixBundling = True, System.Boolean enableDirectives = True, System.Boolean enableLegacyDoubleDashBehavior = False, System.Boolean enableTokenReplacement = True, LocalizationResources resources = null, System.Collections.Generic.IReadOnlyList<System.CommandLine.Invocation.InvocationMiddleware> middlewarePipeline = null, System.Func<System.CommandLine.Binding.BindingContext,System.CommandLine.Help.HelpBuilder> helpBuilderFactory = null, System.CommandLine.Parsing.TryReplaceToken tokenReplacer = null)
     public System.Boolean EnableDirectives { get; }
@@ -232,34 +259,6 @@ System.CommandLine.Binding
   public interface IValueDescriptor<out T> : IValueDescriptor
   public interface IValueSource
     public System.Boolean TryGetValue(IValueDescriptor valueDescriptor, BindingContext bindingContext, ref System.Object& boundValue)
-System.CommandLine.Builder
-  public class CommandLineBuilder
-    .ctor(System.CommandLine.Command rootCommand = null)
-    public System.CommandLine.Command Command { get; }
-    public System.CommandLine.Parsing.Parser Build()
-  public static class CommandLineBuilderExtensions
-    public static CommandLineBuilder AddMiddleware(this CommandLineBuilder builder, System.CommandLine.Invocation.InvocationMiddleware middleware, System.CommandLine.Invocation.MiddlewareOrder order = Default)
-    public static CommandLineBuilder AddMiddleware(this CommandLineBuilder builder, System.Action<System.CommandLine.Invocation.InvocationContext> onInvoke, System.CommandLine.Invocation.MiddlewareOrder order = Default)
-    public static CommandLineBuilder CancelOnProcessTermination(this CommandLineBuilder builder, System.Nullable<System.TimeSpan> timeout = null)
-    public static CommandLineBuilder EnableDirectives(this CommandLineBuilder builder, System.Boolean value = True)
-    public static CommandLineBuilder EnableLegacyDoubleDashBehavior(this CommandLineBuilder builder, System.Boolean value = True)
-    public static CommandLineBuilder EnablePosixBundling(this CommandLineBuilder builder, System.Boolean value = True)
-    public static CommandLineBuilder RegisterWithDotnetSuggest(this CommandLineBuilder builder)
-    public static CommandLineBuilder UseDefaults(this CommandLineBuilder builder)
-    public static CommandLineBuilder UseEnvironmentVariableDirective(this CommandLineBuilder builder)
-    public static CommandLineBuilder UseExceptionHandler(this CommandLineBuilder builder, System.Action<System.Exception,System.CommandLine.Invocation.InvocationContext> onException = null, System.Nullable<System.Int32> errorExitCode = null)
-    public static CommandLineBuilder UseHelp(this CommandLineBuilder builder, System.Nullable<System.Int32> maxWidth = null)
-    public static CommandLineBuilder UseHelp(this CommandLineBuilder builder, System.String[] helpAliases)
-    public static CommandLineBuilder UseHelp(this CommandLineBuilder builder, System.Action<System.CommandLine.Help.HelpContext> customize, System.Nullable<System.Int32> maxWidth = null)
-    public static TBuilder UseHelpBuilder<TBuilder>(this TBuilder builder, System.Func<System.CommandLine.Binding.BindingContext,System.CommandLine.Help.HelpBuilder> getHelpBuilder)
-    public static CommandLineBuilder UseLocalizationResources(this CommandLineBuilder builder, System.CommandLine.LocalizationResources validationMessages)
-    public static CommandLineBuilder UseParseDirective(this CommandLineBuilder builder, System.Nullable<System.Int32> errorExitCode = null)
-    public static CommandLineBuilder UseParseErrorReporting(this CommandLineBuilder builder, System.Nullable<System.Int32> errorExitCode = null)
-    public static CommandLineBuilder UseSuggestDirective(this CommandLineBuilder builder)
-    public static CommandLineBuilder UseTokenReplacer(this CommandLineBuilder builder, System.CommandLine.Parsing.TryReplaceToken replaceToken)
-    public static CommandLineBuilder UseTypoCorrections(this CommandLineBuilder builder, System.Int32 maxLevenshteinDistance = 3)
-    public static CommandLineBuilder UseVersionOption(this CommandLineBuilder builder)
-    public static CommandLineBuilder UseVersionOption(this CommandLineBuilder builder, System.String[] aliases)
 System.CommandLine.Completions
   public abstract class CompletionContext
     public System.CommandLine.Parsing.ParseResult ParseResult { get; }

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.Hosting.Tests/HostingHandlerTest.cs

@@ -1,5 +1,5 @@
 using System.CommandLine.Binding;
-using System.CommandLine.Builder;
+
 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.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/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;