Update System.CommandLine to latest beta version (2.0.0-beta7) (#199)

Author: Copilot

Directory.Packages.props

@@ -10,7 +10,7 @@
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Polly" Version="8.6.3" />
-	<PackageVersion Include="System.CommandLine" Version="2.0.0-beta7.25353.2" />
+	<PackageVersion Include="System.CommandLine" Version="2.0.0-beta7.25380.108" />
     <PackageVersion Include="xunit" Version="2.9.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.4" />
   </ItemGroup>

ListingManager/Program.cs

@@ -4,13 +4,13 @@ namespace EssentialCSharp.ListingManager;
 
 public sealed class Program
 {
-    private static Task<int> Main(string[] args)
+    private static async Task<int> Main(string[] args)
     {
-        CommandLineConfiguration configuration = GetConfiguration();
-        return configuration.InvokeAsync(args);
+        RootCommand rootCommand = GetRootCommand();
+        return await rootCommand.Parse(args).InvokeAsync();
     }
 
-    public static CommandLineConfiguration GetConfiguration()
+    public static RootCommand GetRootCommand()
     {
         // Use the ExistingOnly method to only parse the arguments that are defined in the configuration
 
@@ -47,24 +47,22 @@ public static CommandLineConfiguration GetConfiguration()
             Description = "All listings are in a single directory and not separated into chapter and chapter test directories.",
         };
 
-        Command listingUpdating = new("update", "Updates namespaces and filenames for all listings and accompanying tests within a chapter")
-        {
-            directoryInArgument,
-            verboseOption,
-            previewOption,
-            byFolderOption,
-            singleDirOption,
-            allChaptersOption
-        };
+        Command listingUpdating = new("update", "Updates namespaces and filenames for all listings and accompanying tests within a chapter");
+        listingUpdating.Arguments.Add(directoryInArgument);
+        listingUpdating.Options.Add(verboseOption);
+        listingUpdating.Options.Add(previewOption);
+        listingUpdating.Options.Add(byFolderOption);
+        listingUpdating.Options.Add(singleDirOption);
+        listingUpdating.Options.Add(allChaptersOption);
 
         listingUpdating.SetAction((ParseResult parseResult) =>
         {
-            DirectoryInfo directoryIn = parseResult.CommandResult.GetValue(directoryInArgument)!;
-            bool verbose = parseResult.CommandResult.GetValue(verboseOption);
-            bool preview = parseResult.CommandResult.GetValue(previewOption);
-            bool byFolder = parseResult.CommandResult.GetValue(byFolderOption);
-            bool singleDir = parseResult.CommandResult.GetValue(singleDirOption);
-            bool allChapters = parseResult.CommandResult.GetValue(allChaptersOption);
+            DirectoryInfo directoryIn = parseResult.GetValue(directoryInArgument)!;
+            bool verbose = parseResult.GetValue(verboseOption);
+            bool preview = parseResult.GetValue(previewOption);
+            bool byFolder = parseResult.GetValue(byFolderOption);
+            bool singleDir = parseResult.GetValue(singleDirOption);
+            bool allChapters = parseResult.GetValue(allChaptersOption);
 
             Console.WriteLine($"Updating listings within: {directoryIn}");
             ListingManager listingManager = new(directoryIn);
@@ -80,14 +78,12 @@ public static CommandLineConfiguration GetConfiguration()
 
         Command scan = new("scan", "Scans for various things");
 
-        Command listings = new("listings", "Scans for mismatched listings")
-        {
-            directoryInArgument
-        };
+        Command listings = new("listings", "Scans for mismatched listings");
+        listings.Arguments.Add(directoryInArgument);
 
         listings.SetAction((ParseResult parseResult) =>
         {
-            DirectoryInfo directoryIn = parseResult.CommandResult.GetValue(directoryInArgument)!;
+            DirectoryInfo directoryIn = parseResult.GetValue(directoryInArgument)!;
             var extraListings = ListingManager.GetAllExtraListings(directoryIn.FullName).OrderBy(x => x);
 
             Console.WriteLine("---Extra Listings---");
@@ -96,20 +92,19 @@ public static CommandLineConfiguration GetConfiguration()
                 Console.WriteLine(extraListing);
             }
         });
+        
         scan.Subcommands.Add(listings);
 
-        Command tests = new("tests", "Scans for mismatched tests")
-        {
-            directoryInArgument,
-            allChaptersOption,
-            singleDirOption
-        };
+        Command tests = new("tests", "Scans for mismatched tests");
+        tests.Arguments.Add(directoryInArgument);
+        tests.Options.Add(allChaptersOption);
+        tests.Options.Add(singleDirOption);
 
         tests.SetAction((ParseResult parseResult) =>
         {
-            DirectoryInfo directoryIn = parseResult.CommandResult.GetValue(directoryInArgument)!;
-            bool allChapters = parseResult.CommandResult.GetValue(allChaptersOption);
-            bool singleDir = parseResult.CommandResult.GetValue(singleDirOption);
+            DirectoryInfo directoryIn = parseResult.GetValue(directoryInArgument)!;
+            bool allChapters = parseResult.GetValue(allChaptersOption);
+            bool singleDir = parseResult.GetValue(singleDirOption);
 
             Console.WriteLine("---Missing Tests---");
             if (allChapters)
@@ -124,12 +119,10 @@ public static CommandLineConfiguration GetConfiguration()
 
         scan.Subcommands.Add(tests);
 
-        RootCommand rootCommand = new("The EssentialCSharp.ListingManager helps to organize and manage the EssentialCSharp source code")
-        {
-            listingUpdating,
-            scan
-        };
+        RootCommand rootCommand = new("The EssentialCSharp.ListingManager helps to organize and manage the EssentialCSharp source code");
+        rootCommand.Subcommands.Add(listingUpdating);
+        rootCommand.Subcommands.Add(scan);
 
-        return new CommandLineConfiguration(rootCommand);
+        return rootCommand;
     }
-}
+}

NuGet.config

@@ -7,10 +7,6 @@
   </packageSources>
 
   <packageSourceMapping>
-    <packageSource key="daily">
-      <package pattern="System.CommandLine" />
-      <package pattern="System.CommandLine.*" />
-    </packageSource>
     <packageSource key="nuget.org">
       <package pattern="*" />
     </packageSource>