Update CommandLineUtils to 4.1.1 (#35)

Author: emgarten

build/config.props

@@ -2,7 +2,7 @@
   <!-- Dependency versions -->
   <PropertyGroup>
     <NuGetPackageVersion>6.12.1</NuGetPackageVersion>
-    <CommandLineUtilsVersion>2.0.0</CommandLineUtilsVersion>
+    <CommandLineUtilsVersion>4.1.1</CommandLineUtilsVersion>
     <NuGetTestHelpersVersion>2.1.38</NuGetTestHelpersVersion>
     <SleetVersion>5.2.12</SleetVersion>
     <JsonVersion>13.0.3</JsonVersion>

src/NuGet.CatalogValidator/ValidateCommand.cs

@@ -23,7 +23,11 @@ internal static class ValidateCommand
     {
         public static void Register(CommandLineApplication cmdApp, HttpSource httpSource, ILogger consoleLog)
         {
-            cmdApp.Command("validate", (cmd) => Run(cmd, httpSource, consoleLog), throwOnUnexpectedArg: true);
+            cmdApp.Command("validate", cmd =>
+            {
+                cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
+                Run(cmd, httpSource, consoleLog);
+            });
         }
 
         private static void Run(CommandLineApplication cmd, HttpSource httpSource, ILogger consoleLog)
@@ -41,7 +45,7 @@ private static void Run(CommandLineApplication cmd, HttpSource httpSource, ILogg
 
             cmd.HelpOption(Constants.HelpOption);
 
-            cmd.OnExecute(async () =>
+            cmd.OnExecuteAsync(async (CancellationToken _) =>
             {
                 var timer = new Stopwatch();
                 timer.Start();

src/NuGetMirror/ListCommand.cs

@@ -16,7 +16,11 @@ internal static class ListCommand
     {
         public static void Register(CommandLineApplication cmdApp, HttpSource httpSource, ILogger log)
         {
-            cmdApp.Command("list", (cmd) => Run(cmd, httpSource, log), throwOnUnexpectedArg: true);
+            cmdApp.Command("list", cmd =>
+            {
+                cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
+                Run(cmd, httpSource, log);
+            });
         }
 
         private static void Run(CommandLineApplication cmd, HttpSource httpSource, ILogger log)
@@ -34,7 +38,7 @@ private static void Run(CommandLineApplication cmd, HttpSource httpSource, ILogg
 
             cmd.HelpOption(Constants.HelpOption);
 
-            cmd.OnExecute(async () =>
+            cmd.OnExecuteAsync(async (CancellationToken _) =>
             {
                 try
                 {

src/NuGetMirror/NupkgsCommand.cs

@@ -23,7 +23,11 @@ internal static class NupkgsCommand
     {
         public static void Register(CommandLineApplication cmdApp, HttpSource httpSource, ILogger consoleLog)
         {
-            cmdApp.Command("nupkgs", (cmd) => Run(cmd, httpSource, consoleLog), throwOnUnexpectedArg: true);
+            cmdApp.Command("nupkgs", cmd =>
+            {
+                cmd.UnrecognizedArgumentHandling = UnrecognizedArgumentHandling.Throw;
+                Run(cmd, httpSource, consoleLog);
+            });
         }
 
         private static void Run(CommandLineApplication cmd, HttpSource httpSource, ILogger consoleLog)
@@ -51,7 +55,7 @@ private static void Run(CommandLineApplication cmd, HttpSource httpSource, ILogg
 
             cmd.HelpOption(Constants.HelpOption);
 
-            cmd.OnExecute(async () =>
+            cmd.OnExecuteAsync(async (CancellationToken _) =>
             {
                 var timer = new Stopwatch();
                 timer.Start();