Test install.exe

ricaun-io · Dec 6, 2024 · 108d63d · 108d63d
1 parent 3b2fdb2
commit 108d63d
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 7 deletions.
diff --git a/Build/INuGetKeyVaultSign.cs b/Build/INuGetKeyVaultSign.cs
@@ -20,6 +20,10 @@ public interface INuGetKeyVaultSign : IClean, ICompile
         .Before(Compile)
         .Executes(() =>
         {
+            new AzureSignToolTests().SetupEnvironmentToolPath();
+            Serilog.Log.Information(AzureSignToolTasks.AzureSignToolPath);
+
+            new NuGetKeyVaultSignToolTests().SetupEnvironmentToolPath();
             Serilog.Log.Information(NuGetKeyVaultSignToolTasks.NuGetKeyVaultSignToolPath);
 
             if (string.IsNullOrEmpty(AZURE_KEY_VAULT_FILE))
@@ -34,7 +38,7 @@ public interface INuGetKeyVaultSign : IClean, ICompile
                 return;
             }
 
-            var azureKeyVaultFile = JsonConvert.DeserializeObject<AzureKeyVaultConfig>(AZURE_KEY_VAULT_FILE);
+            var azureKeyVaultFile = AzureKeyVaultConfig.Create(AZURE_KEY_VAULT_FILE);
             var azureKeyVaultClientSecret = AZURE_KEY_VAULT_PASSWORD;
 
             if (azureKeyVaultFile is null)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Test `AzureKeyVaultConfig` with `AZURE_KEY_VAULT_FILE` environment variable.
 - Test `NuGetKeyVaultSignTool` in a package.
 - Test `AzureSignTool` in a assembly file, show subject with `GetSignedFileSubject`.
+- Test `AzureSignTool` in a install.exe file.
 
 [vNext]: ../../compare/1.0.0...HEAD
 [1.0.0]: ../../compare/1.0.0
diff --git a/Nuke.NuGetKeyVaultSignTool/AzureKeyVaultConfig.cs b/Nuke.NuGetKeyVaultSignTool/AzureKeyVaultConfig.cs
@@ -1,14 +1,59 @@
 namespace Nuke.NuGetKeyVaultSignTool
 {
+    /// <summary>
+    /// Represents the configuration for Azure Key Vault.
+    /// </summary>
     public class AzureKeyVaultConfig
     {
+        /// <summary>
+        /// Gets or sets the Azure Key Vault certificate.
+        /// </summary>
         public string AzureKeyVaultCertificate { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Azure Key Vault URL.
+        /// </summary>
         public string AzureKeyVaultUrl { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Azure Key Vault client ID.
+        /// </summary>
         public string AzureKeyVaultClientId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the Azure Key Vault tenant ID.
+        /// </summary>
         public string AzureKeyVaultTenantId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the timestamp URL.
+        /// </summary>
         public string TimestampUrl { get; set; }
+
+        /// <summary>
+        /// Gets or sets the timestamp digest.
+        /// </summary>
         public string TimestampDigest { get; set; }
 
+        /// <summary>
+        /// Creates an instance of <see cref="AzureKeyVaultConfig"/> from the specified JSON content.
+        /// </summary>
+        /// <param name="jsonContent">The JSON content representing the Azure Key Vault configuration.</param>
+        /// <returns>An instance of <see cref="AzureKeyVaultConfig"/>.</returns>
+        public static AzureKeyVaultConfig Create(string jsonContent)
+        {
+            try
+            {
+                return Newtonsoft.Json.JsonConvert.DeserializeObject<AzureKeyVaultConfig>(jsonContent);
+            }
+            catch { }
+            return default;
+        }
+
+        /// <summary>
+        /// Checks if the Azure Key Vault configuration is valid.
+        /// </summary>
+        /// <returns><c>true</c> if the configuration is valid; otherwise, <c>false</c>.</returns>
         public bool IsValid()
         {
             return !string.IsNullOrEmpty(AzureKeyVaultCertificate) &&

diff --git a/Nuke.NuGetKeyVaultSignTool/AzureKeyVaultConfigTests.cs b/Nuke.NuGetKeyVaultSignTool/AzureKeyVaultConfigTests.cs
@@ -1,5 +1,4 @@
 using NUnit.Framework;
-using Newtonsoft.Json;
 
 namespace Nuke.NuGetKeyVaultSignTool
 {
@@ -17,11 +16,20 @@ public void JsonIsNotValidTest()
             }
             """;
 
-            var azureKeyVaultFile = JsonConvert.DeserializeObject<AzureKeyVaultConfig>(content);
+            var azureKeyVaultFile = AzureKeyVaultConfig.Create(content);
             Assert.IsNotNull(azureKeyVaultFile);
             Assert.IsFalse(azureKeyVaultFile.IsValid());
         }
 
+        [Test]
+        public void JsonIsNullTest()
+        {
+            var content = "";
+
+            var azureKeyVaultFile = AzureKeyVaultConfig.Create(content);
+            Assert.IsNull(azureKeyVaultFile);
+        }
+
         [Test]
         public void JsonIsValidTest()
         {
@@ -34,7 +42,7 @@ public void JsonIsValidTest()
             }
             """;
 
-            var azureKeyVaultFile = JsonConvert.DeserializeObject<AzureKeyVaultConfig>(content);
+            var azureKeyVaultFile = AzureKeyVaultConfig.Create(content);
             Assert.IsNotNull(azureKeyVaultFile);
             Assert.IsTrue(azureKeyVaultFile.IsValid());
             Assert.AreEqual("AzureKeyVaultCertificate", azureKeyVaultFile.AzureKeyVaultCertificate);

diff --git a/Nuke.NuGetKeyVaultSignTool/AzureSignToolTests.cs b/Nuke.NuGetKeyVaultSignTool/AzureSignToolTests.cs
@@ -2,7 +2,6 @@
 using NUnit.Framework;
 using System.IO;
 using System.Reflection;
-using Nuke.Common.Tools.NuGetKeyVaultSignTool;
 using Nuke.Common.Tools.AzureSignTool;
 using Nuke.CodeGeneration;
 using Newtonsoft.Json;
@@ -51,6 +50,7 @@ public void SetUpAzureSignToolTasks()
         }
 
         [TestCase("Files/assembly.dll")]
+        [TestCase("Files/install.exe")]
         public void SignFile(string fileName)
         {
             if (string.IsNullOrEmpty(AZURE_KEY_VAULT_FILE))
@@ -59,7 +59,7 @@ public void SignFile(string fileName)
             if (string.IsNullOrEmpty(AZURE_KEY_VAULT_PASSWORD))
                 Assert.Ignore("AZURE_KEY_VAULT_PASSWORD is null.");
 
-            var azureKeyVaultFile = JsonConvert.DeserializeObject<AzureKeyVaultConfig>(AZURE_KEY_VAULT_FILE);
+            var azureKeyVaultFile = AzureKeyVaultConfig.Create(AZURE_KEY_VAULT_FILE);
             var azureKeyVaultClientSecret = AZURE_KEY_VAULT_PASSWORD;
 
             if (azureKeyVaultFile.IsValid() == false)

diff --git a/Nuke.NuGetKeyVaultSignTool/Files/install.exe b/Nuke.NuGetKeyVaultSignTool/Files/install.exe
diff --git a/Nuke.NuGetKeyVaultSignTool/NuGetKeyVaultSignToolTests.cs b/Nuke.NuGetKeyVaultSignTool/NuGetKeyVaultSignToolTests.cs
@@ -59,7 +59,7 @@ public void SignPackage(string fileName)
             if (string.IsNullOrEmpty(AZURE_KEY_VAULT_PASSWORD))
                 Assert.Ignore("AZURE_KEY_VAULT_PASSWORD is null.");
 
-            var azureKeyVaultFile = JsonConvert.DeserializeObject<AzureKeyVaultConfig>(AZURE_KEY_VAULT_FILE);
+            var azureKeyVaultFile = AzureKeyVaultConfig.Create(AZURE_KEY_VAULT_FILE);
             var azureKeyVaultClientSecret = AZURE_KEY_VAULT_PASSWORD;
 
             if (azureKeyVaultFile.IsValid() == false)

diff --git a/Nuke.NuGetKeyVaultSignTool/Nuke.NuGetKeyVaultSignTool.csproj b/Nuke.NuGetKeyVaultSignTool/Nuke.NuGetKeyVaultSignTool.csproj
@@ -21,6 +21,9 @@
     <None Update="Files\assembly.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Files\install.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="Files\package.nupkg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>