From 5456e989f0451338e490e981ac442e77634b9ba5 Mon Sep 17 00:00:00 2001 From: ryannewington Date: Tue, 23 Jul 2019 19:13:27 +1000 Subject: [PATCH] Updates build configurations to support EV certs --- .gitignore | 1 + src/Installer/Installer.wixproj | 9 +- ...net.ActiveDirectory.PasswordProtection.sln | 46 +++++++-- .../Properties/AssemblyInfo.cs | 4 +- src/PasswordFilter/PasswordFilter.rc | Bin 5282 -> 5282 bytes src/PasswordFilter/PasswordFilter.vcxproj | 97 +++++++++++++++++- ....ActiveDirectory.PasswordProtection.csproj | 20 +++- .../Properties/AssemblyInfo.cs | 6 +- ...ctory.PasswordProtection.PowerShell.csproj | 20 +++- .../Properties/AssemblyInfo.cs | 6 +- 10 files changed, 190 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 6dc4447..36c6f7f 100644 --- a/.gitignore +++ b/.gitignore @@ -262,3 +262,4 @@ __pycache__/ *.dll *.bin /src/enc_temp_folder/* +*.cab diff --git a/src/Installer/Installer.wixproj b/src/Installer/Installer.wixproj index a24aa61..d66c42e 100644 --- a/src/Installer/Installer.wixproj +++ b/src/Installer/Installer.wixproj @@ -28,7 +28,11 @@ bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ - + + bin\$(Platform)\$(Configuration)\ + obj\$(Platform)\$(Configuration)\ + + bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ @@ -85,8 +89,9 @@ + - "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 ("C:\Program Files (x86)\Microsoft SDKs\ClickOnce\SignTool\signtool.exe" sign /sha1 "$(CSCERTTHUMBPRINT)" /t http://timestamp.digicert.com /fd sha256 /v "$(TargetFileName)")