Merge pull request #640 from badbort/mcmaster-update-3.0.0

filipw · web-flow · commit 114aed079204 · 2022-02-04T11:49:53.000+01:00
Updated McMaster.Extensions.CommandLineUtils to 3.0.0
diff --git a/src/Dotnet.Script/Dotnet.Script.csproj b/src/Dotnet.Script/Dotnet.Script.csproj
@@ -25,7 +25,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-6.final" />
-        <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.2.5" />
+        <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.0.0" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     </ItemGroup>
     <ItemGroup>
diff --git a/src/Dotnet.Script/Program.cs b/src/Dotnet.Script/Program.cs
@@ -55,8 +55,9 @@ public static Func<string, bool, LogFactory> CreateLogFactory
 
         private static int Wain(string[] args)
         {
-            var app = new CommandLineApplication(throwOnUnexpectedArg: false)
+            var app = new CommandLineApplication()
             {
+                UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.CollectAndContinue,
                 ExtendedHelpText = "Starting without a path to a CSX file or a command, starts the REPL (interactive) mode."
             };
 
@@ -83,7 +84,7 @@ private static int Wain(string[] args)
                 var code = c.Argument("code", "Code to execute.");
                 var cwd = c.Option("-cwd |--workingdirectory <currentworkingdirectory>", "Working directory for the code compiler. Defaults to current directory.", CommandOptionType.SingleValue);
                 c.HelpOption(helpOptionTemplate);
-                c.OnExecute(async () =>
+                c.OnExecuteAsync(async (cancellationToken) =>
                 {
                     var source = code.Value;
                     if (string.IsNullOrWhiteSpace(source))
@@ -198,7 +199,7 @@ private static int Wain(string[] args)
                 var dllPath = c.Argument("dll", "Path to DLL based script");
                 var commandDebugMode = c.Option(DebugFlagShort + " | " + DebugFlagLong, "Enables debug output.", CommandOptionType.NoValue);
                 c.HelpOption(helpOptionTemplate);
-                c.OnExecute(async () =>
+                c.OnExecuteAsync(async (cancellationToken) =>
                 {
                     if (string.IsNullOrWhiteSpace(dllPath.Value))
                     {
@@ -217,7 +218,7 @@ private static int Wain(string[] args)
                 });
             });
 
-            app.OnExecute(async () =>
+            app.OnExecuteAsync(async (cancellationToken) =>
             {
                 int exitCode = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,9 @@ public static Func<string, bool, LogFactory> CreateLogFactory`
`55`	`55`
`56`	`56`	`private static int Wain(string[] args)`
`57`	`57`	`{`
`58`		`- var app = new CommandLineApplication(throwOnUnexpectedArg: false)`
	`58`	`+ var app = new CommandLineApplication()`
`59`	`59`	`{`
	`60`	`+ UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.CollectAndContinue,`
`60`	`61`	`ExtendedHelpText = "Starting without a path to a CSX file or a command, starts the REPL (interactive) mode."`
`61`	`62`	`};`
`62`	`63`
`@@ -83,7 +84,7 @@ private static int Wain(string[] args)`
`83`	`84`	`var code = c.Argument("code", "Code to execute.");`
`84`	`85`	`var cwd = c.Option("-cwd \|--workingdirectory <currentworkingdirectory>", "Working directory for the code compiler. Defaults to current directory.", CommandOptionType.SingleValue);`
`85`	`86`	`c.HelpOption(helpOptionTemplate);`
`86`		`- c.OnExecute(async () =>`
	`87`	`+ c.OnExecuteAsync(async (cancellationToken) =>`
`87`	`88`	`{`
`88`	`89`	`var source = code.Value;`
`89`	`90`	`if (string.IsNullOrWhiteSpace(source))`
`@@ -198,7 +199,7 @@ private static int Wain(string[] args)`
`198`	`199`	`var dllPath = c.Argument("dll", "Path to DLL based script");`
`199`	`200`	`var commandDebugMode = c.Option(DebugFlagShort + " \| " + DebugFlagLong, "Enables debug output.", CommandOptionType.NoValue);`
`200`	`201`	`c.HelpOption(helpOptionTemplate);`
`201`		`- c.OnExecute(async () =>`
	`202`	`+ c.OnExecuteAsync(async (cancellationToken) =>`
`202`	`203`	`{`
`203`	`204`	`if (string.IsNullOrWhiteSpace(dllPath.Value))`
`204`	`205`	`{`
`@@ -217,7 +218,7 @@ private static int Wain(string[] args)`
`217`	`218`	`});`
`218`	`219`	`});`
`219`	`220`
`220`		`- app.OnExecute(async () =>`
	`221`	`+ app.OnExecuteAsync(async (cancellationToken) =>`
`221`	`222`	`{`
`222`	`223`	`int exitCode = 0;`
`223`	`224`