From f5ad388b85f094aa8a75a87b2b3331aec2c5f4d3 Mon Sep 17 00:00:00 2001 From: ryannewington Date: Tue, 23 Jul 2019 19:44:28 +1000 Subject: [PATCH] Fixes build condition to sign with the EV certificate on a MS-signed release --- src/Installer/Installer.wixproj | 11 +++++++++-- src/Lithnet.ActiveDirectory.PasswordProtection.sln | 4 ++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Installer/Installer.wixproj b/src/Installer/Installer.wixproj index d66c42e..ca48c5a 100644 --- a/src/Installer/Installer.wixproj +++ b/src/Installer/Installer.wixproj @@ -89,9 +89,16 @@ - - if $(ConfigurationName) == EVSignedRelease ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)") else ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)") + if $(ConfigurationName) == EVSignedRelease ( + "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)" +) else ( + if $(ConfigurationName) == MicrosoftSignedRelease ( + "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(EVCSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)" + ) else ( + "C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)" + ) +)