feature: implement API on host builder to fetch CommandLineContext from non DI contexts (#368)

Co-authored-by: Daniel Meza <[email protected]>

Author: danielmeza

src/Hosting.CommandLine/HostBuilderContextExtensions.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using McMaster.Extensions.CommandLineUtils.Abstractions;
+using McMaster.Extensions.Hosting.CommandLine.Internal;
+
+namespace Microsoft.Extensions.Hosting
+{
+    /// <summary>
+    /// Extensions methods for the <see cref="HostBuilderContext"/>
+    /// </summary>
+    public static class HostBuilderContextExtensions
+    {
+        /// <summary>
+        /// Get the <see cref="CommandLineContext"/> used to run the app
+        /// </summary>
+        /// <param name="context">This instance</param>
+        /// <returns>The <see cref="CommandLineContext"/> used to run the app</returns>
+        public static CommandLineContext GetCommandLineContext(this HostBuilderContext context)
+            => (CommandLineContext)context.Properties[typeof(CommandLineState)];
+    }
+}

src/Hosting.CommandLine/HostBuilderExtensions.cs

@@ -60,6 +60,7 @@ public static async Task<int> RunCommandLineApplicationAsync<TApp>(
             configure ??= app => { };
             var exceptionHandler = new StoreExceptionHandler();
             var state = new CommandLineState(args);
+            hostBuilder.Properties[typeof(CommandLineState)] = state;
             hostBuilder.ConfigureServices(
                 (context, services)
                     =>
@@ -111,6 +112,7 @@ public static async Task<int> RunCommandLineApplicationAsync(
         {
             var exceptionHandler = new StoreExceptionHandler();
             var state = new CommandLineState(args);
+            hostBuilder.Properties[typeof(CommandLineState)] = state;
             hostBuilder.ConfigureServices(
                 (context, services)
                     =>

src/Hosting.CommandLine/PublicAPI.Shipped.txt

@@ -4,3 +4,6 @@ Microsoft.Extensions.Hosting.HostBuilderExtensions
 static Microsoft.Extensions.Hosting.HostBuilderExtensions.RunCommandLineApplicationAsync<TApp>(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, string[] args, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<int>
 static Microsoft.Extensions.Hosting.HostBuilderExtensions.RunCommandLineApplicationAsync<TApp>(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, string[] args, System.Action<McMaster.Extensions.CommandLineUtils.CommandLineApplication<TApp>> configure, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<int>
 static Microsoft.Extensions.Hosting.HostBuilderExtensions.RunCommandLineApplicationAsync(this Microsoft.Extensions.Hosting.IHostBuilder hostBuilder, string[] args, System.Action<McMaster.Extensions.CommandLineUtils.CommandLineApplication> configure, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<int>
+Microsoft.Extensions.Hosting.HostBuilderContextExtensions
+static Microsoft.Extensions.Hosting.HostBuilderContextExtensions.GetCommandLineContext(this Microsoft.Extensions.Hosting.HostBuilderContext context) -> McMaster.Extensions.CommandLineUtils.Abstractions.CommandLineContext
+

test/Hosting.CommandLine.Tests/HostBuilderExtensionsBuilderAPITests.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Threading.Tasks;
 using McMaster.Extensions.CommandLineUtils;
+using McMaster.Extensions.CommandLineUtils.Abstractions;
 using McMaster.Extensions.CommandLineUtils.Conventions;
 using McMaster.Extensions.Hosting.CommandLine.Tests.Utilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -102,5 +103,28 @@ public async Task TestUsingServiceProvider()
 
             Assert.NotNull(env);
         }
+
+        [Fact]
+        public async Task TestCommandLineContextFromNonDIContexts()
+        {
+            CommandLineContext configureServicesContext = null;
+            CommandLineContext confgureAppContext = null;
+            await new HostBuilder()
+               .ConfigureServices((context, collection) =>
+               {
+                   configureServicesContext = context.GetCommandLineContext();
+                   collection.AddSingleton<IConsole>(new TestConsole(_output));
+               })
+               .ConfigureAppConfiguration((context, builder) =>
+               {
+                   confgureAppContext = context.GetCommandLineContext();
+               })
+               .RunCommandLineApplicationAsync(new string[0], app => app.OnExecute(() =>
+               {
+               }));
+
+            Assert.NotNull(configureServicesContext);
+            Assert.NotNull(confgureAppContext);
+        }
     }
 }