Merge pull request #1737 from NJullienSweet/master

Add "unspecified" store type to allow third-party tool AzureSignTool
oleg-shilo · Feb 5, 2025 · 4ea49f7 · 4ea49f7
2 parents 88acb4c + bd13294
commit 4ea49f7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/Source/src/WixSharp/CommonTasks.cs b/Source/src/WixSharp/CommonTasks.cs
@@ -205,19 +205,24 @@ static public int DigitalySign(string fileToSign, string certificateId, string t
             bool shouldSignSHA1 = (hashAlgorithm & HashAlgorithmType.sha1) == HashAlgorithmType.sha1;
             bool shouldSignSHA256 = (hashAlgorithm & HashAlgorithmType.sha256) == HashAlgorithmType.sha256;
 
-            string certPlace;
+            string certOption;
             switch (certificateStore)
             {
                 case StoreType.commonName:
-                    certPlace = "/n";
+                    certOption = "/n";
                     break;
 
                 case StoreType.sha1Hash:
-                    certPlace = "/sha1";
+                    certOption = "/sha1";
                     break;
 
+                case StoreType.file:
+                    certOption = "/f";
+                    break;
+
+                case StoreType.unspecified:
                 default:
-                    certPlace = "/f";
+                    certOption = string.Empty;
                     break;
             }
 
@@ -240,7 +245,9 @@ static public int DigitalySign(string fileToSign, string certificateId, string t
                     break;
             }
 
-            string args = $"sign {outputLevelArg}{certPlace} \"{certificateId}\"";
+            string certPart = certOption.IsEmpty() ? string.Empty : $"{certOption} \"{certificateId}\"";
+
+            string args = $"sign {outputLevelArg}{certPart}";
             if (password.IsNotEmpty())
                 args += $" /p \"{password}\"";
 

diff --git a/Source/src/WixSharp/Enums.cs b/Source/src/WixSharp/Enums.cs
@@ -450,7 +450,8 @@ public enum StoreType
     {
         file,
         commonName,
-        sha1Hash
+        sha1Hash,
+        unspecified
     }
 
     [Flags]