From 561fba7d62ebddf4bbec6238cfa4230ebde4326c Mon Sep 17 00:00:00 2001
From: Tommy Parnell <tparnell@vistaprint.com>
Date: Wed, 1 Mar 2017 10:14:17 -0500
Subject: [PATCH] fix certpath issues

---
 QuikPak/Config.cs  | 4 ++++
 QuikPak/Program.cs | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/QuikPak/Config.cs b/QuikPak/Config.cs
index 88e8d24..69f8ce9 100644
--- a/QuikPak/Config.cs
+++ b/QuikPak/Config.cs
@@ -1,4 +1,6 @@
 using System.Collections.Generic;
+using Newtonsoft.Json;
+using WixSharp;
 
 namespace QuikPak
 {
@@ -32,5 +34,7 @@ namespace QuikPak
         public string Path { get; set; }
 
         public string Password { get; set; }
+        [JsonIgnore]
+        public Binary BinaryKey { get; set; }
     }
 }
diff --git a/QuikPak/Program.cs b/QuikPak/Program.cs
index be12579..13c51b2 100644
--- a/QuikPak/Program.cs
+++ b/QuikPak/Program.cs
@@ -76,9 +76,14 @@ namespace QuikPak
                 GUID = string.IsNullOrWhiteSpace(config.Id) ? Guid.NewGuid() : new Guid(config.Id),
                 UI = WUI.WixUI_ProgressOnly,
                 OutFileName = config.Name,
-                PreserveTempFiles = true,
+                PreserveTempFiles = false,
+                Binaries = config.Certificates?.Select(a=> {
+                    var bin = new Binary(a.Path);
+                    a.BinaryKey = bin;
+                    return bin;
+                }).ToArray() ?? new Binary[0],
                 UpgradeCode = new Guid(config.UpgradeCode),
-                Certificates = config.Certificates?.Select(a => new Certificate { PFXPassword = a.Password, CertificatePath = a.Path, Request = false, StoreName = StoreName.personal, StoreLocation = StoreLocation.localMachine, Name = a.Name}).ToArray() ?? new Certificate[0]
+                Certificates = config.Certificates?.Select(a => new Certificate() { PFXPassword = a.Password, BinaryKey = a.BinaryKey.Id, StoreName = StoreName.personal, StoreLocation = StoreLocation.localMachine, Name = a.Name}).ToArray() ?? new Certificate[0]
             };
             project.Properties.Add(new Property("REINSTALLMODE", "dmus"));
             project.MajorUpgrade = new MajorUpgrade() { AllowDowngrades = true, Schedule = UpgradeSchedule.afterInstallInitialize };