Updates package versions and command-line parsing

Upgrades System.CommandLine and XAMLTest package versions; refactors CommandLineOptions to use the updated System.CommandLine API for option definition and value retrieval.

Author: Keboo

Directory.packages.props

@@ -25,17 +25,17 @@
     <PackageVersion Include="Microsoft.Toolkit.MVVM" Version="7.1.2" />
     <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="Polyfill" Version="8.8.1" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
     <PackageVersion Include="ShowMeTheXAML" Version="2.0.0" />
     <PackageVersion Include="ShowMeTheXAML.AvalonEdit" Version="2.0.0" />
     <PackageVersion Include="ShowMeTheXAML.MSBuild" Version="2.0.0" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.2" />
+    <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
+    <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
     <PackageVersion Include="TUnit" Version="0.25.21" />
     <PackageVersion Include="VirtualizingWrapPanel" Version="1.5.8" />
-    <PackageVersion Include="XAMLTest" Version="1.3.0-ci616" />
-    <PackageVersion Include="System.Memory" Version="4.6.3" />
-    <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
-    <PackageVersion Include="Polyfill" Version="8.8.1" />
+    <PackageVersion Include="XAMLTest" Version="1.3.1-ci662" />
   </ItemGroup>
 </Project>

src/MainDemo.Wpf/CommandLineOptions.cs

@@ -1,25 +1,30 @@
 using System.CommandLine;
-using System.CommandLine.Parsing;
 using MaterialDesignThemes.Wpf;
 
 namespace MaterialDesign.Shared;
 
 internal static class CommandLineOptions
 {
     private static readonly Option<string> PageOption =
-        new(aliases: new[] {"--page", "-p"},
-            getDefaultValue: () => "Home",
-            description: "Sets the startup page of the Demo app.");
+        new("--page", "-p")
+        {
+            DefaultValueFactory = _ => "Home",
+            Description = "Sets the startup page of the Demo app."
+        };
 
     private static readonly Option<FlowDirection> FlowDirectionOption =
-        new(aliases: new[] { "--flowDirection", "-f" },
-            getDefaultValue: () => FlowDirection.LeftToRight,
-            description: "Sets the startup flow direction of the Demo app.");
+        new("--flowDirection", "-f")
+        {
+            DefaultValueFactory = _ => FlowDirection.LeftToRight,
+            Description = "Sets the startup flow direction of the Demo app."
+        };
 
     private static readonly Option<BaseTheme> ThemeOption =
-        new(aliases: new[] { "--theme", "-t" },
-            getDefaultValue: () => BaseTheme.Inherit,
-            description: "Sets the startup theme of the Demo app.");
+        new("--theme", "-t")
+        {
+            DefaultValueFactory = _ => BaseTheme.Inherit,
+            Description = "Sets the startup theme of the Demo app."
+        };
 
     private static readonly RootCommand RootCommand =
         new(description: "MaterialDesignInXamlToolkit Demo app command line options.")
@@ -34,9 +39,9 @@ public static (string? StartPage, FlowDirection FlowDirection, BaseTheme BaseThe
         ParseResult parseResult = RootCommand.Parse(args);
 
         return new(
-            parseResult.GetValueForOption(PageOption),
-            parseResult.GetValueForOption(FlowDirectionOption),
-            parseResult.GetValueForOption(ThemeOption)
+            parseResult.GetValue(PageOption),
+            parseResult.GetValue(FlowDirectionOption),
+            parseResult.GetValue(ThemeOption)
         );
     }
 }