TerribleDev/QuikPak
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix certpath issues

Browse Source
This commit is contained in:
Tommy Parnell
2017-03-01 10:14:17 -05:00
parent fe71454e65
commit 561fba7d62
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
QuikPak/Config.cs
View File

@@ -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; }
}
}

9
QuikPak/Program.cs
View File

@@ -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 };