Minor cleanup and update release notes

Author: natemcmaster

CHANGELOG.md

@@ -1,11 +1,12 @@
 # Changelog
 
-[Unreleased changes](https://github.com/natemcmaster/CommandLineUtils/compare/v2.5.1...HEAD):
+[Unreleased changes](https://github.com/natemcmaster/CommandLineUtils/compare/v2.6.0...HEAD):
 
 ### Improvements
 
 * [@AlexeyEvlampiev] - implement support for GUID command line options ([#333]) and any other type that TypeConverter supports ([#62])
 * Disabled the pager for help text by default. To re-enable, set UsePagerForHelpText = true. ([#346])
+* [@vpkopylov] - Added support for using the 'builder API' with generic host ([#351])
 
 ### Breaking changes
 
@@ -23,6 +24,7 @@
 [#337]: https://github.com/natemcmaster/CommandLineUtils/issues/337
 [#333]: https://github.com/natemcmaster/CommandLineUtils/issues/333
 [#346]: https://github.com/natemcmaster/CommandLineUtils/issues/346
+[#351]: https://github.com/natemcmaster/CommandLineUtils/pull/351
 
 ## [v2.6.0](https://github.com/natemcmaster/CommandLineUtils/compare/v2.5.1...v2.6.0)
 

src/Hosting.CommandLine/Internal/CommandLineService.cs

@@ -44,7 +44,7 @@ public CommandLineService(ILogger<CommandLineService> logger, CommandLineState s
                 _application.Conventions.AddConvention(convention);
 
             }
-          
+
             configure(_application);
         }
 

src/Hosting.CommandLine/releasenotes.props

@@ -1,6 +1,10 @@
 <Project>
   <PropertyGroup>
     <PackageReleaseNotes Condition="$(VersionPrefix.StartsWith('3.0.'))">
+Features:
+* @vpkopylov - Added support for using the 'builder API' by calling .RunCommandLineApplicationAsync(args, app => { })
+  See https://github.com/natemcmaster/CommandLineUtils/pull/351 for details.
+
 Changes:
 * Dependency on Microsoft.Extensions.Hosting lowered to Microsoft.Extensions.Hosting.Abstractions.
   You may need to add a direct reference to Microsoft.Extensions.Hosting if this is not already in your

test/Hosting.CommandLine.Tests/HostBuilderExtensionsAttrubuteAPITests.cs renamed to test/Hosting.CommandLine.Tests/HostBuilderExtensionsAttributeAPITests.cs

@@ -26,7 +26,7 @@ public async Task TestReturnCode()
         {
             var exitCode = await new HostBuilder()
                     .ConfigureServices(collection => collection.AddSingleton<IConsole>(new TestConsole(_output)))
-                    .RunCommandLineApplicationAsync(new string[0], (app) => app.OnExecute(() => 42));
+                    .RunCommandLineApplicationAsync(new string[0], app => app.OnExecute(() => 42));
             Assert.Equal(42, exitCode);
         }
 
@@ -39,7 +39,7 @@ public async Task TestConsoleInjection()
             console.SetupGet(c => c.Out).Returns(textWriter.Object);
             await new HostBuilder()
                 .ConfigureServices(collection => collection.AddSingleton(console.Object))
-                .RunCommandLineApplicationAsync(new string[0], (app) => app.OnExecute(() => app.Out.WriteLine("42")));
+                .RunCommandLineApplicationAsync(new string[0], app => app.OnExecute(() => app.Out.WriteLine("42")));
             Mock.Verify(console, textWriter);
         }
 
@@ -57,7 +57,7 @@ public async Task TestConventionInjection()
                 .ConfigureServices(collection => collection
                     .AddSingleton<IConsole>(new TestConsole(_output))
                     .AddSingleton(convention.Object))
-                .RunCommandLineApplicationAsync(args, (app) => app.OnExecute(() =>
+                .RunCommandLineApplicationAsync(args, app => app.OnExecute(() =>
                 {
                     remainingArgs = app.RemainingArguments.ToArray();
                 }));
@@ -71,7 +71,7 @@ public async Task ItThrowsOnUnknownSubCommand()
             var ex = await Assert.ThrowsAsync<UnrecognizedCommandParsingException>(
                 async () => await new HostBuilder()
                     .ConfigureServices(collection => collection.AddSingleton<IConsole>(new TestConsole(_output)))
-                    .RunCommandLineApplicationAsync(new string[] { "return41" }, (app) =>
+                    .RunCommandLineApplicationAsync(new string[] { "return41" }, app =>
                     {
                         app.Command("return42", (cmd => cmd.OnExecute(() => 42)));
                     }));
@@ -84,7 +84,7 @@ public async Task ItRethrowsThrownExceptions()
             var ex = await Assert.ThrowsAsync<InvalidOperationException>(
                 () => new HostBuilder()
                     .ConfigureServices(collection => collection.AddSingleton<IConsole>(new TestConsole(_output)))
-                    .RunCommandLineApplicationAsync(new string[0], (app) => app.OnExecute(() => throw new InvalidOperationException("A test"))));
+                    .RunCommandLineApplicationAsync(new string[0], app => app.OnExecute(() => throw new InvalidOperationException("A test"))));
             Assert.Equal("A test", ex.Message);
         }
 
@@ -95,7 +95,7 @@ public async Task TestUsingServiceProvider()
 
             await new HostBuilder()
                 .ConfigureServices(collection => collection.AddSingleton<IConsole>(new TestConsole(_output)))
-                .RunCommandLineApplicationAsync(new string[0], (app) => app.OnExecute(() =>
+                .RunCommandLineApplicationAsync(new string[0], app => app.OnExecute(() =>
                 {
                     env = app.GetRequiredService<IHostEnvironment>();
                 }));