Bump System.CommandLine and System.Text.Json (#554)

Author: dependabot[bot]

XmlDocConflictResolver/Program.cs

@@ -5,33 +5,37 @@ class Program
 {
     static async Task<int> Main(string[] args)
     {
-        var ixmlOption = new Option<DirectoryInfo?>(
-            name: "--ixml",
-            description: "The path to the IntelliSense XML files generated by the compiler.")
-        { IsRequired = true };
+        var ixmlOption = new Option<DirectoryInfo?>("--isenseDir")
+        {
+            Required = true,
+            Description = "The path to the IntelliSense XML files generated by the compiler."
+        };
 
-        var ecmaxmlOption = new Option<DirectoryInfo?>(
-            name: "--ecmaxml",
-            description: "The path to the ECMAXML files from the docs repo.")
-        { IsRequired = true };
+        var ecmaxmlOption = new Option<DirectoryInfo?>("--ecmaxmlDir")
+        {
+            Required = true,
+            Description = "The path to the ECMAXML files from the docs repo."
+        };
 
         var rootCommand = new RootCommand("IntelliSense XML <-> ECMAXML doc comment resolver app");
-        rootCommand.AddOption(ixmlOption);
-        rootCommand.AddOption(ecmaxmlOption);
+        rootCommand.Options.Add(ixmlOption);
+        rootCommand.Options.Add(ecmaxmlOption);
 
-        rootCommand.SetHandler((ixmlDir, ecmaxmlDir) =>
+        rootCommand.SetAction(parseResult =>
         {
-            MergeAndAnnotate(ixmlDir!, ecmaxmlDir!);
-        },
-            ixmlOption, ecmaxmlOption);
+            DirectoryInfo intelliSenseDir = parseResult.GetValue<DirectoryInfo>("--isenseDir");
+            DirectoryInfo ecmaxmlDir = parseResult.GetValue<DirectoryInfo>("--ecmaxmlDir");
+
+            MergeAndAnnotate(intelliSenseDir, ecmaxmlDir);
+        });
 
-        return await rootCommand.InvokeAsync(args);
+        return rootCommand.Parse(args).Invoke();
     }
 
     static void MergeAndAnnotate(DirectoryInfo iXmlDir, DirectoryInfo ecmaxmlDir)
     {
         // Load all files
-        // For each member in the IntelliSense XML, see if there's non-emtpy text in ECMAXML.
+        // For each member in the IntelliSense XML, see if there's non-empty text in ECMAXML.
         // If so, save both versions of the text in the IntelliSense XML object.
         // After the for each loop, write new XML for any namespaces
         // that have members with more than one copy of summary/returns/param etc.
@@ -43,4 +47,4 @@ static void MergeAndAnnotate(DirectoryInfo iXmlDir, DirectoryInfo ecmaxmlDir)
         checker.AddConflictMarkers();
         checker.CleanUpFiles();
     }
-}
+}

XmlDocConflictResolver/XmlDocConflictResolver.csproj

@@ -9,8 +9,8 @@
 
   <ItemGroup>
     <PackageReference Include="Cake.Powershell" Version="4.0.0" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
-    <PackageReference Include="System.Text.Json" Version="9.0.6" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta6.25358.103" />
+    <PackageReference Include="System.Text.Json" Version="9.0.7" />
   </ItemGroup>
 
 </Project>