remove ConsoleAppHost, reanme RunConsoleAppEngine -> RunConsoleAppFramework

Author: neuecc

sandbox/MultiContainedApp/Program.cs

@@ -10,8 +10,8 @@ class Program
     {
         static async Task Main(string[] args)
         {
-            await ConsoleAppHost.CreateDefaultBuilder()
-                .RunConsoleAppEngineAsync(args);
+            await Host.CreateDefaultBuilder()
+                .RunConsoleAppFrameworkAsync(args);
         }
     }
 

sandbox/SingleContainedApp/Program.cs

@@ -117,16 +117,16 @@ public class ComplexArgTest : ConsoleAppBase
     {
         public void Foo(int[] array, Person person)
         {
-            Console.WriteLine(array.Length + ":" + string.Join(", ", array));
-            Console.WriteLine(person.Age + ":" + person.Name);
+            Context.Logger.LogTrace(array.Length + ":" + string.Join(", ", array));
+            Context.Logger.LogInformation(person.Age + ":" + person.Name);
         }
     }
 
     public class StandardArgTest : ConsoleAppBase
     {
         public void Run([Option(0, "message of x.")]string x)
         {
-            Console.WriteLine("1." + x);
+            // Console.WriteLine("1." + x);
             //Console.WriteLine("2." + y);
         }
     }
@@ -141,15 +141,22 @@ class Program
     {
         static async Task Main(string[] args)
         {
-            // args = new[] { "-array", "10,20,30", "-person", @"{""Age"":10,""Name"":""foo""}" };
+            args = new[] { "-array", "10,20,30", "-person", @"{""Age"":10,""Name"":""foo""}" };
 
-            await ConsoleAppHost.CreateDefaultBuilder()
-                .ConfigureServices((hostContext, services) =>
+
+            await Host.CreateDefaultBuilder()
+                .ConfigureLogging(logging =>
                 {
-                    // mapping config json to IOption<MyConfig>
-                    services.Configure<MyConfig>(hostContext.Configuration);
+                    logging.SetMinimumLevel(LogLevel.Trace).ReplaceToSimpleConsole();
                 })
-                .RunConsoleAppEngineAsync<StandardArgTest>(args);
+                .RunConsoleAppFrameworkAsync<ComplexArgTest>(args);
+            // .RunConsoleAppEngineAsync
+            //.ConfigureServices((hostContext, services) =>
+            //{
+            //    // mapping config json to IOption<MyConfig>
+            //    services.Configure<MyConfig>(hostContext.Configuration);
+            //})
+            //.RunConsoleAppEngineAsync<StandardArgTest>(args);
         }
     }
 }

sandbox/SingleContainedAppWithConfig/Program.cs

@@ -1,5 +1,6 @@
 using ConsoleAppFramework;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.Threading.Tasks;
@@ -36,7 +37,7 @@ class Program
         static async Task Main(string[] args)
         {
             // using ConsoleAppFramework.Configuration;
-            await ConsoleAppFramework.ConsoleAppHost.CreateDefaultBuilder()
+            await Host.CreateDefaultBuilder()
                 .ConfigureServices((hostContext, services) =>
                 {
                     services.AddOptions();
@@ -47,7 +48,7 @@ await ConsoleAppFramework.ConsoleAppHost.CreateDefaultBuilder()
                     services.AddTransient<MyServiceB>();
                     services.AddSingleton<MyServiceC>();
                 })
-                .RunConsoleAppEngineAsync<Baz>(args);
+                .RunConsoleAppFrameworkAsync<Baz>(args);
         }
     }
 

src/ConsoleAppFramework/ConsoleAppEngineHostBuilderExtensions.cs

@@ -13,7 +13,10 @@ public static class ConsoleAppEngineHostBuilderExtensions
         const string HelpCommand = "help";
         const string VersionCommand = "version";
 
-        public static IHostBuilder UseConsoleAppEngine(this IHostBuilder hostBuilder, string[] args, IConsoleAppInterceptor? interceptor = null)
+        /// <summary>
+        /// Setup multiple ConsoleApp that are searched from all assemblies.
+        /// </summary>
+        public static IHostBuilder UseConsoleAppFramework(this IHostBuilder hostBuilder, string[] args, IConsoleAppInterceptor? interceptor = null)
         {
             IHostBuilder ConfigureEmptyService()
             {
@@ -105,12 +108,18 @@ IHostBuilder ConfigureEmptyService()
             return hostBuilder.UseConsoleLifetime();
         }
 
-        public static Task RunConsoleAppEngineAsync(this IHostBuilder hostBuilder, string[] args, IConsoleAppInterceptor? interceptor = null)
+        /// <summary>
+        /// Run multiple ConsoleApp that are searched from all assemblies.
+        /// </summary>
+        public static Task RunConsoleAppFrameworkAsync(this IHostBuilder hostBuilder, string[] args, IConsoleAppInterceptor? interceptor = null)
         {
-            return UseConsoleAppEngine(hostBuilder, args, interceptor).Build().RunAsync();
+            return UseConsoleAppFramework(hostBuilder, args, interceptor).Build().RunAsync();
         }
 
-        public static IHostBuilder UseConsoleAppEngine<T>(this IHostBuilder hostBuilder, string[] args, IConsoleAppInterceptor? interceptor = null)
+        /// <summary>
+        /// Setup a single ConsoleApp type that is targeted by type argument.
+        /// </summary>
+        public static IHostBuilder UseConsoleAppFramework<T>(this IHostBuilder hostBuilder, string[] args, IConsoleAppInterceptor? interceptor = null)
             where T : ConsoleAppBase
         {
             IHostBuilder ConfigureEmptyService()
@@ -200,10 +209,13 @@ IHostBuilder ConfigureEmptyService()
             return hostBuilder.UseConsoleLifetime();
         }
 
-        public static Task RunConsoleAppEngineAsync<T>(this IHostBuilder hostBuilder, string[] args, IConsoleAppInterceptor? interceptor = null)
+        /// <summary>
+        /// Run a single ConsoleApp type that is targeted by type argument.
+        /// </summary>
+        public static Task RunConsoleAppFrameworkAsync<T>(this IHostBuilder hostBuilder, string[] args, IConsoleAppInterceptor? interceptor = null)
             where T : ConsoleAppBase
         {
-            return UseConsoleAppEngine<T>(hostBuilder, args, interceptor).Build().RunAsync();
+            return UseConsoleAppFramework<T>(hostBuilder, args, interceptor).Build().RunAsync();
         }
 
         static bool TrimEquals(string arg, string command)

src/ConsoleAppFramework/ConsoleAppHost.cs

@@ -1,7 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
+using System.Linq;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 using System;
+using ConsoleAppFramework.Logging;
 
 namespace ConsoleAppFramework.Logging
 {
@@ -76,13 +78,37 @@ public void Dispose()
             }
         }
     }
+}
 
+namespace ConsoleAppFramework
+{
     public static class SimpleConsoleLoggerExtensions
     {
+        /// <summary>
+        /// use ConsoleAppFramework.Logging.SimpleConsoleLogger.
+        /// </summary>
+        /// <param name="builder"></param>
+        /// <returns></returns>
         public static ILoggingBuilder AddSimpleConsole(this ILoggingBuilder builder)
         {
             builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<ILoggerProvider, SimpleConsoleLoggerProvider>());
             return builder;
         }
+
+        /// <summary>
+        /// Remove default ConsoleLoggerProvider and replace to SimpleConsoleLogger.
+        /// </summary>
+        public static ILoggingBuilder ReplaceToSimpleConsole(this ILoggingBuilder builder)
+        {
+            // Use SimpleConsoleLogger instead of the default ConsoleLogger.
+            var consoleLogger = builder.Services.FirstOrDefault(x => x.ImplementationType?.FullName == "Microsoft.Extensions.Logging.Console.ConsoleLoggerProvider");
+            if (consoleLogger != null)
+            {
+                builder.Services.Remove(consoleLogger);
+            }
+
+            builder.AddSimpleConsole();
+            return builder;
+        }
     }
 }

src/ConsoleAppFramework/SimpleConsoleLogger.cs

@@ -28,12 +28,12 @@ class ResultContainer
         [Fact]
         public async Task TestCommandName()
         {
-            var host = ConsoleAppHost.CreateDefaultBuilder()
+            var host = Host.CreateDefaultBuilder()
                 .ConfigureServices((c, services) =>
                 {
                     services.AddSingleton<ResultContainer>();
                 })
-                .UseConsoleAppEngine<CommandAttributeTestCommand>(new string[]{ "test", "-value", "1" })
+                .UseConsoleAppFramework<CommandAttributeTestCommand>(new string[]{ "test", "-value", "1" })
                 .Build();
             var result = host.Services.GetService<ResultContainer>();
             await host.RunAsync();

tests/ConsoleAppFramework.Tests/CommandAttributeTest.cs

@@ -55,55 +55,55 @@ public Task<int> ExitCodeWithTaskException()
         public async Task NoExitCode()
         {
             Environment.ExitCode = 0;
-            await new HostBuilder().RunConsoleAppEngineAsync<ExitCodeTestBatch>(new[] { nameof(NoExitCode) });
+            await new HostBuilder().RunConsoleAppFrameworkAsync<ExitCodeTestBatch>(new[] { nameof(NoExitCode) });
             Assert.Equal(0, Environment.ExitCode);
         }
 
         [Fact]
         public async Task NoExitCodeWithTask()
         {
             Environment.ExitCode = 0;
-            await new HostBuilder().RunConsoleAppEngineAsync<ExitCodeTestBatch>(new[] { nameof(NoExitCodeWithTask) });
+            await new HostBuilder().RunConsoleAppFrameworkAsync<ExitCodeTestBatch>(new[] { nameof(NoExitCodeWithTask) });
             Assert.Equal(0, Environment.ExitCode);
         }
 
         [Fact]
         public async Task NoExitCodeException()
         {
             Environment.ExitCode = 0;
-            await new HostBuilder().RunConsoleAppEngineAsync<ExitCodeTestBatch>(new[] { nameof(NoExitCodeException) });
+            await new HostBuilder().RunConsoleAppFrameworkAsync<ExitCodeTestBatch>(new[] { nameof(NoExitCodeException) });
             Assert.Equal(1, Environment.ExitCode);
         }
 
         [Fact]
         public async Task ExitCode()
         {
             Environment.ExitCode = 0;
-            await new HostBuilder().RunConsoleAppEngineAsync<ExitCodeTestBatch>(new[] { nameof(ExitCode) });
+            await new HostBuilder().RunConsoleAppFrameworkAsync<ExitCodeTestBatch>(new[] { nameof(ExitCode) });
             Assert.Equal(12345, Environment.ExitCode);
         }
 
         [Fact]
         public async Task ExitCodeException()
         {
             Environment.ExitCode = 0;
-            await new HostBuilder().RunConsoleAppEngineAsync<ExitCodeTestBatch>(new[] { nameof(ExitCodeException) });
+            await new HostBuilder().RunConsoleAppFrameworkAsync<ExitCodeTestBatch>(new[] { nameof(ExitCodeException) });
             Assert.Equal(1, Environment.ExitCode);
         }
 
         [Fact]
         public async Task ExitCodeWithTask()
         {
             Environment.ExitCode = 0;
-            await new HostBuilder().RunConsoleAppEngineAsync<ExitCodeTestBatch>(new[] { nameof(ExitCodeWithTask) });
+            await new HostBuilder().RunConsoleAppFrameworkAsync<ExitCodeTestBatch>(new[] { nameof(ExitCodeWithTask) });
             Assert.Equal(54321, Environment.ExitCode);
         }
 
         [Fact]
         public async Task ExitCodeWithTaskException()
         {
             Environment.ExitCode = 0;
-            await new HostBuilder().RunConsoleAppEngineAsync<ExitCodeTestBatch>(new[] { nameof(ExitCodeWithTaskException) });
+            await new HostBuilder().RunConsoleAppFrameworkAsync<ExitCodeTestBatch>(new[] { nameof(ExitCodeWithTaskException) });
             Assert.Equal(1, Environment.ExitCode);
         }