Merge remote-tracking branch 'origin/master'

Author: neuecc

ReadMe.md

@@ -768,16 +768,35 @@ The hooking behavior using `PosixSignalRegistration` is determined by the presen
 In the case of `Run/RunAsync` from `ConsoleAppBuilder`, you can also pass a CancellationToken. This is combined with PosixSignalRegistration and passed to each method. This makes it possible to cancel at any arbitrary timing.
 
 ```csharp
-var cancellationTokenSource = new CancellationTokenSource();
+// Create a CancellationTokenSource that will be cancelled when 'Q' is pressed.
+var cts = new CancellationTokenSource();
+_ = Task.Run(() =>
+{
+    while (Console.ReadKey().Key != ConsoleKey.Q) ;
+    Console.WriteLine();
+    cts.Cancel();
+});
 
 var app = ConsoleApp.Create();
 
-app.Add("", (CancellationToken cancellationToken) =>
+app.Add("", async (CancellationToken cancellationToken) =>
 {
-    // do anything...
+    // CancellationToken will be triggered when 'Q' is pressed or Ctrl+C(SIGINT/SIGTERM/SIGKILL) is sent.
+    try
+    {
+        for (int i = 0; i < 10; i++)
+        {
+            Console.WriteLine($"Running main task iteration {i + 1}/10. Press 'Q' to quit.");
+            await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken);
+        }
+    }
+    catch (OperationCanceledException)
+    {
+        Console.WriteLine("Main task was cancelled.");
+    }
 });
 
-await app.RunAsync(args, cancellationTokenSource.Token); // pass external CancellationToken
+await app.RunAsync(args, cts.Token); // pass external CancellationToken
 ```
 
 Exit Code
@@ -1239,8 +1258,10 @@ If you want to use other DI container(like [DryIoc](https://github.com/dadhi/Dry
 // dotnet add package DryIoc.Microsoft.DependencyInjection
 var app = ConsoleApp.Create()
     // setup DryIoc as the DI container
-    .ConfigureContainer(new DryIocServiceProviderFactory())
-    .ConfigureServices(services => services.AddSingleton<MyService>());
+    .ConfigureContainer(new DryIocServiceProviderFactory(), container =>
+    {
+        container.Register<MyService>();
+    });
 
 app.Add("", ([FromServices] MyService service) => { });
 

sandbox/GeneratorSandbox/GeneratorSandbox.csproj

@@ -20,7 +20,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
     <PackageReference Include="DryIoc.Microsoft.DependencyInjection" Version="6.2.0" />
 
-    <!--<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.6" />-->
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
     <!--
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />

sandbox/GeneratorSandbox/Program.cs

@@ -1,4 +1,4 @@
-using ConsoleAppFramework;
+using ConsoleAppFramework;
 
 args = "9999 --x 1000".Split(' ');
 

src/ConsoleAppFramework/Emitter.cs

@@ -855,6 +855,7 @@ public void EmitConfigure(SourceBuilder sb, DllReference dllReference)
             sb.AppendLine();
             using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureContainer<TContainerBuilder>(IServiceProviderFactory<TContainerBuilder> factory, Action<TContainerBuilder>? configure = null) where TContainerBuilder : notnull"))
             {
+                sb.AppendLine("this.isRequireCallBuildAndSetServiceProvider = true;");
                 using (sb.BeginBlock("createServiceProvider = services =>"))
                 {
                     sb.AppendLine("var containerBuilder = factory.CreateBuilder(services);");
@@ -936,17 +937,13 @@ public void EmitConfigure(SourceBuilder sb, DllReference dllReference)
         // Build
         using (sb.BeginBlock("partial void BuildAndSetServiceProvider(ConsoleAppContext context)"))
         {
-            if (dllReference.HasDependencyInjection && dllReference.HasLogging)
-            {
-                sb.AppendLine("if (configureServices == null && configureLogging == null) return;");
-            }
-            else if (dllReference.HasDependencyInjection)
-            {
-                sb.AppendLine("if (configureServices == null) return;");
-            }
-
             if (dllReference.HasDependencyInjection)
             {
+                using(sb.BeginBlock("if (!isRequireCallBuildAndSetServiceProvider)"))
+                {
+                    sb.AppendLine("return;");
+                }
+
                 if (dllReference.HasConfiguration)
                 {
                     sb.AppendLine("var config = configuration;");