Merge branch 'mgaberc-biosistemika-bugs/generate-signature-options' into develop

Author: Deadpikle

src/NetSparkle.Tests.AppCastGenerator/OptionsTests.cs

@@ -0,0 +1,41 @@
+using CommandLine;
+using NetSparkleUpdater.AppCastGenerator;
+using Xunit;
+
+namespace NetSparkle.Tests.AppCastGenerator
+{
+    public class OptionsTests
+    {
+        [Fact]
+        public void ParseArguments_NoKeyOverrideInitially()
+        {
+            var args = new[]
+            {
+                "--generate-signature", "binary.exe",
+            };
+
+            var result = Parser.Default.ParseArguments<Options>(args);
+
+            Assert.Empty(result.Errors);
+            Assert.Equal("", result.Value.PublicKeyOverride);
+            Assert.Equal("", result.Value.PrivateKeyOverride);
+        }
+
+        [Fact]
+        public void ParseArguments_KeysOverrideAndGenerateSignature_Compatibility()
+        {
+            var args = new[]
+            {
+                "--generate-signature", "binary.exe",
+                "--public-key-override", "TestPublicKey",
+                "--private-key-override", "TestPrivateKey"
+            };
+
+            var result = Parser.Default.ParseArguments<Options>(args);
+
+            Assert.Empty(result.Errors);
+            Assert.Equal("TestPublicKey", result.Value.PublicKeyOverride);
+            Assert.Equal("TestPrivateKey", result.Value.PrivateKeyOverride);
+        }
+    }
+}

src/NetSparkle.Tools.AppCastGenerator/Options.cs

@@ -81,12 +81,12 @@ public class Options
             Default = false)]
         public bool UseEd25519SignatureAttributeForXml { get; set; }
 
-        [Option("public-key-override", SetName = "local", Required = false, HelpText = "Public key override (ignores whatever is in the public key file) for signing binaries. This" +
+        [Option("public-key-override", Required = false, HelpText = "Public key override (ignores whatever is in the public key file) for signing binaries. This" +
             " overrides ALL other public keys set when verifying binaries, INCLUDING public key set via environment variables! " +
             "If not set, uses --key-path (if set) or the default SignatureManager location. Not used in --generate-keys or --export.", Default = "")]
         public string? PublicKeyOverride { get; set; }
 
-        [Option("private-key-override", SetName = "local", Required = false, HelpText = "Private key override (ignores whatever is in the private key file) for signing binaries. This" +
+        [Option("private-key-override", Required = false, HelpText = "Private key override (ignores whatever is in the private key file) for signing binaries. This" +
             " overrides ALL other private keys set when signing binaries, INCLUDING private key set via environment variables! " +
             "If not set, uses --key-path (if set) or the default SignatureManager location. Not used in --generate-keys or --export.", Default = "")]
         public string? PrivateKeyOverride { get; set; }