Merge pull request #29 from ricaun-io/develop

Version 1.2.0
ricaun-io · Apr 4, 2022 · e016193 · e016193
2 parents c2ac9c8 + cf74838
commit e016193
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.2.0] / 2022-04-04
+### Features
+- Add Sign multiple Timestamp Server
+
 ## [1.1.3] / 2022-03-10
 ### New Features
 - Add SignFolder on ISign

diff --git a/README.md b/README.md
@@ -2,6 +2,9 @@
 
 This package is to simplify the build automation system using [Nuke.Common](https://www.nuget.org/packages/Nuke.Common/).
 
+[![Visual Studio 2019](https://img.shields.io/badge/Visual%20Studio%202019-16.11.7+-blue)](../..)
+[![Nuke](https://img.shields.io/badge/Nuke-Build-blue)](https://nuke.build/)
+[![License MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![Publish](../../actions/workflows/Publish.yml/badge.svg)](../../actions)
 [![Develop](../../actions/workflows/Develop.yml/badge.svg)](../../actions)
 [![Release](https://img.shields.io/nuget/v/ricaun.Nuke?logo=nuget&label=release&color=blue)](https://www.nuget.org/packages/ricaun.Nuke)

diff --git a/ricaun.Nuke.RevitAddin.Example/ricaun.Nuke.RevitAddin.Example.csproj b/ricaun.Nuke.RevitAddin.Example/ricaun.Nuke.RevitAddin.Example.csproj
@@ -77,7 +77,7 @@
 
   <PropertyGroup>
     <PackageId>ricaun.Nuke.RevitAddin.Example</PackageId>
-    <Version>1.0.0</Version>
+    <Version>1.2.0</Version>
     <ProjectGuid>{a030741a-2fd6-48c3-9f92-3ab9f35dd17a}</ProjectGuid>
   </PropertyGroup>
 

diff --git a/ricaun.Nuke/Extensions/SignExtension.cs b/ricaun.Nuke/Extensions/SignExtension.cs
@@ -14,9 +14,12 @@ public static class SignExtension
         #region Sign Util
 
         /// <summary>
-        /// timestampServer
+        /// timestampServers
         /// </summary>
-        const string timestampServer = "http://timestamp.digicert.com/";
+        static readonly string[] timestampServers = {
+            "http://timestamp.comodoca.com",
+            "http://timestamp.digicert.com"
+        };
 
         /// <summary>
         /// VerifySignFile
@@ -63,21 +66,27 @@ public static void SignBinary(string certPath, string certPassword, string binar
 
             Serilog.Log.Information($"Signing: {binaryPath}");
 
-            try
-            {
-                SignToolTasks.SignTool(x => x
-                    .SetFiles(binaryPath)
-                    .SetFile(certPath)
-                    .SetPassword(certPassword)
-                    .SetTimestampServerUrl(timestampServer)
-                    .SetFileDigestAlgorithm(SignToolDigestAlgorithm.SHA256)
-                );
-            }
-            catch (Exception)
+            foreach (var timestampServer in timestampServers)
             {
-                Serilog.Log.Error($"Failed to sign file '{binaryPath}");
+                try
+                {
+                    SignToolTasks.SignTool(x => x
+                        .SetFiles(binaryPath)
+                        .SetFile(certPath)
+                        .SetPassword(certPassword)
+                        .SetTimestampServerUrl(timestampServer)
+                        .SetFileDigestAlgorithm(SignToolDigestAlgorithm.SHA256)
+                        .EnableQuiet()
+                    );
+                    Serilog.Log.Information($"Signing done with '{timestampServer}");
+                    return;
+                }
+                catch (Exception)
+                {
+                    Serilog.Log.Warning($"Failed to sign file with '{timestampServer}");
+                }
             }
-
+            Serilog.Log.Error($"Failed to sign file '{binaryPath}");
         }
 
         /// <summary>
@@ -92,23 +101,29 @@ public static void SignNuGet(string certPath, string certPassword, string binary
 
             Serilog.Log.Information($"Signing: {binaryPath}");
 
-            try
+            foreach (var timestampServer in timestampServers)
             {
-                NuGetTasks.NuGet(
-                    $"sign \"{binaryPath}\"" +
-                    $" -CertificatePath {certPath}" +
-                    $" -CertificatePassword {certPassword}" +
-                    $" -Timestamper {timestampServer} -NonInteractive",
-                    logOutput: false,
-                    logInvocation: false
-                    ); // don't print to std out/err
-            }
-            catch (Exception)
-            {
-                // Exception doesn't say anything useful generally and don't want to expose it if it does
-                // so don't log it
-                Serilog.Log.Error($"Failed to sign nuget package '{binaryPath}");
+                try
+                {
+                    NuGetTasks.NuGet(
+                        $"sign \"{binaryPath}\"" +
+                        $" -CertificatePath {certPath}" +
+                        $" -CertificatePassword {certPassword}" +
+                        $" -Timestamper {timestampServer} -NonInteractive",
+                        logOutput: false,
+                        logInvocation: false
+                        ); // don't print to std out/err
+
+                    Serilog.Log.Information($"Signing done with '{timestampServer}");
+                    return;
+                }
+                catch (Exception)
+                {
+                    Serilog.Log.Warning($"Failed to sign file with '{timestampServer}");
+                }
             }
+
+            Serilog.Log.Error($"Failed to sign nuget package '{binaryPath}");
         }
 
         /// <summary>

diff --git a/ricaun.Nuke/ricaun.Nuke.csproj b/ricaun.Nuke/ricaun.Nuke.csproj
@@ -7,7 +7,7 @@
 
   <PropertyGroup>
     <PackageId>ricaun.Nuke</PackageId>
-    <Version>1.1.3</Version>
+    <Version>1.2.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>