fix: system.commandline

Author: HMBSbige

.github/workflows/CI.yml

@@ -37,6 +37,10 @@ jobs:
         with:
           dotnet-version: ${{ env.NET_VERSION }}
 
+      - name: Test build
+        working-directory: src
+        run: dotnet test -c Release
+
       - name: Run tests
         working-directory: src/${{ env.ProjectName }}.Tests
         run: dotnet test -c Release

src/CryptoBase.SpeedTest/CryptoTest.cs

@@ -2,21 +2,21 @@ namespace CryptoBase.SpeedTest;
 
 internal class CryptoTest(int step, double duration)
 {
-	public static ReadOnlySpan<byte> Key => new byte[]
-	{
+	public static ReadOnlySpan<byte> Key =>
+	[
 		0, 1, 2, 3, 4, 5, 6, 7, 8,
 		9, 10, 11, 12, 13, 14, 15,
 		16, 17, 18, 19, 20, 21, 22, 23,
 		24, 25, 26, 27, 28, 29, 30, 31
-	};
+	];
 
-	public static ReadOnlySpan<byte> IV => new byte[]
-	{
+	public static ReadOnlySpan<byte> IV =>
+	[
 		0, 1, 2, 3, 4, 5, 6, 7, 8,
 		9, 10, 11, 12, 13, 14, 15,
 		16, 17, 18, 19, 20, 21, 22, 23,
 		24, 25, 26, 27, 28, 29, 30, 31
-	};
+	];
 
 	public void Test(IStreamCrypto crypto)
 	{

src/CryptoBase.SpeedTest/Program.cs

@@ -8,9 +8,9 @@
 global using System.Diagnostics;
 global using System.Reflection;
 global using System.Runtime.Intrinsics;
+global using System.Runtime.Intrinsics.X86;
 global using System.Security.Cryptography;
 global using X86Aes = System.Runtime.Intrinsics.X86.Aes;
-using System.Runtime.Intrinsics.X86;
 
 #if DEBUG
 Console.WriteLine(@"On Debug mode");
@@ -20,26 +20,43 @@
 	Console.WriteLine(@"Debugger attached!");
 }
 
-Argument<string> methodsArgument = new(@"method(s)", () => CryptoList.All, @"Methods separated by commas.");
-methodsArgument.AddCompletions(CryptoList.All);
+Argument<string> methodsArgument = new(@"method(s)")
+{
+	Description = @"Methods separated by commas.",
+	DefaultValueFactory = _ => CryptoList.All
+};
+methodsArgument.CompletionSources.Add(CryptoList.All);
+
 foreach (string method in CryptoList.Methods)
 {
-	methodsArgument.AddCompletions(method);
+	methodsArgument.CompletionSources.Add(method);
 }
-Option<double> secondsOption = new(@"--seconds", () => 3.0, @"Run benchmarks for num seconds.");
-secondsOption.AddAlias(@"-s");
-Option<int> bytesOption = new(@"--bytes", () => 8 * 1024, @"Run benchmarks on num-byte buffers.");
-bytesOption.AddAlias(@"-b");
 
-RootCommand cmd =
-[
+Option<double> secondsOption = new(@"--seconds", @"-s")
+{
+	Description = @"Run benchmarks for num seconds.",
+	DefaultValueFactory = _ => 3.0
+};
+
+Option<int> bytesOption = new(@"--bytes", @"-b")
+{
+	Description = @"Run benchmarks on num-byte buffers.",
+	DefaultValueFactory = _ => 8 * 1024
+};
+
+RootCommand cmd = new()
+{
 	methodsArgument,
 	secondsOption,
 	bytesOption
-];
+};
 
-cmd.SetHandler((methods, seconds, bytes) =>
+cmd.SetAction(parseResult =>
 {
+	string methods = parseResult.GetRequiredValue(methodsArgument);
+	double seconds = parseResult.GetRequiredValue(secondsOption);
+	int bytes = parseResult.GetRequiredValue(bytesOption);
+
 	Console.WriteLine($@"OS Version:                                     {Environment.OSVersion}");
 	Console.WriteLine($@".NET Version:                                   {Environment.Version}");
 	Console.WriteLine($@"App Version:                                    {Assembly.GetExecutingAssembly().GetCustomAttribute<AssemblyInformationalVersionAttribute>()!.InformationalVersion}");
@@ -68,6 +85,7 @@
 	Console.WriteLine();
 
 	IEnumerable<string> methodList = methods.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+
 	if (methodList.Contains(CryptoList.All, StringComparer.OrdinalIgnoreCase))
 	{
 		methodList = CryptoList.Methods;
@@ -81,6 +99,7 @@
 		Console.Write($@"Testing {realMethod}: ");
 
 		CryptoTest t = new(bytes, seconds);
+
 		switch (crypto)
 		{
 			case XChaCha20Poly1305Crypto xc20P1305:
@@ -100,6 +119,6 @@
 			}
 		}
 	}
-}, methodsArgument, secondsOption, bytesOption);
+});
 
-return cmd.Invoke(args);
+return await cmd.Parse(args).InvokeAsync();