Merge remote-tracking branch 'upstream/master'

Author: dusrdev

sandbox/GeneratorSandbox/Program.cs

@@ -1,22 +1,11 @@
 using ConsoleAppFramework;
 
-var app = ConsoleApp.Create();
 
-app.Add("build|b", () => { });
-app.Add("keyvault|kv", () => { });
-app.Add<Commands>();
+args = ["--x", "3", "--y", "5"];
 
-app.Run(args);
+await ConsoleApp.RunAsync(args, async (int x, int y) => { });
 
-public class Commands
+static void Foo(int x, int y)
 {
-    /// <summary>
-    /// Executes the check command using the specified coordinates.
-    /// </summary>
-    [Command("check|c")]
-    public void Check() { }
-
-    /// <summary>Build this packages's and its dependencies' documenation.</summary>
-    [Command("doc|d")]
-    public void Doc() { }
+    Console.WriteLine(x + y);
 }

src/ConsoleAppFramework/CommandHelpBuilder.cs

@@ -49,7 +49,7 @@ public static string BuildCommandHelpMessage(Command command)
 
     public static string BuildCliSchema(IEnumerable<Command> commands)
     {
-        return "return new[] {\n"
+        return "return new CommandHelpDefinition[] {\n"
             + string.Join(", \n", commands.Select(x => CreateCommandHelpDefinition(x).ToCliSchema()))
             + "\n};";
     }

src/ConsoleAppFramework/ConsoleAppBaseCode.cs

@@ -235,7 +235,7 @@ public static Action<string> LogError
     /// ConsoleApp.Run(args, Foo);<br/>
     /// ConsoleApp.Run(args, &amp;Foo);<br/>
     /// </summary>
-    public static void Run(string[] args)
+    public static void Run(string[] args, Delegate command)
     {
     }
 
@@ -245,7 +245,7 @@ public static void Run(string[] args)
     /// ConsoleApp.RunAsync(args, Foo);<br/>
     /// ConsoleApp.RunAsync(args, &amp;Foo);<br/>
     /// </summary>
-    public static Task RunAsync(string[] args)
+    public static Task RunAsync(string[] args, Delegate command)
     {
         return Task.CompletedTask;
     }

src/ConsoleAppFramework/ConsoleAppGenerator.cs

@@ -221,7 +221,7 @@ static void EmitConsoleAppRun(SourceProductionContext sourceProductionContext, C
             var emitter = new Emitter(null);
             var requiredParsableParameterCount = command.Parameters.Count(p => p.IsParsable && p.RequireCheckArgumentParsed);
             var withId = new Emitter.CommandWithId(null, command, -1, requiredParsableParameterCount);
-            emitter.EmitRun(sb, withId, command.IsAsync, null);
+            emitter.EmitRun(sb, withId, commandContext.IsAsync, null);
         }
         sourceProductionContext.AddSource("ConsoleApp.Run.g.cs", sb.ToString().ReplaceLineEndings());
 

src/ConsoleAppFramework/Emitter.cs

@@ -963,6 +963,7 @@ public void EmitConfigure(SourceBuilder sb, DllReference dllReference)
                 {
                     sb.AppendLine("return;");
                 }
+                sb.AppendLine("isRequireCallBuildAndSetServiceProvider = false;");
 
                 if (dllReference.HasConfiguration)
                 {

tests/ConsoleAppFramework.GeneratorTests/RunTest.cs

@@ -284,4 +284,44 @@ public void ArgumentLastParams()
 
         verifier.Execute(code, "--opt1 abc a b c d", "abc, a|b|c|d");
     }
+
+    [Fact]
+    public void RunAndRunAsyncOverloads()
+    {
+        verifier.Execute("""
+ConsoleApp.Run(args, () => Console.Write("sync"));
+""", "", "sync");
+
+        verifier.Execute("""
+ConsoleApp.Run(args, async () => Console.Write("async"));
+""", "", "async");
+
+        verifier.Execute("""
+await ConsoleApp.RunAsync(args, () => Console.Write("sync"));
+""", "", "sync");
+
+        verifier.Execute("""
+await ConsoleApp.RunAsync(args, async () => Console.Write("async"));
+""", "", "async");
+    }
+
+    [Fact]
+    public void RunAndRunAsyncOverloadsWithCancellationToken()
+    {
+        verifier.Execute("""
+ConsoleApp.Run(args, (CancellationToken cancellationToken) => Console.Write("sync"));
+""", "", "sync");
+
+        verifier.Execute("""
+ConsoleApp.Run(args, async (CancellationToken cancellationToken) => Console.Write("async"));
+""", "", "async");
+
+        verifier.Execute("""
+await ConsoleApp.RunAsync(args, (CancellationToken cancellationToken) => Console.Write("sync"));
+""", "", "sync");
+
+        verifier.Execute("""
+await ConsoleApp.RunAsync(args, async (CancellationToken cancellationToken) => Console.Write("async"));
+""", "", "async");
+    }
 }