7 Commits

Author SHA1 Message Date
Tommy Parnell
418c62fa01 Merge pull request #2 from TerribleDev/preserveTemp
preserve temp files
2017-04-04 10:43:04 -04:00
Tommy Parnell
5751b50621 preserve temp files 2017-04-04 10:37:29 -04:00
Tommy Parnell
26235b3ab4 Merge pull request #1 from TerribleDev/enable64bits
enable 64 bits
2017-04-04 10:36:09 -04:00
Tommy Parnell
eb76fa5db6 enable 64 bits 2017-04-04 10:03:39 -04:00
Tommy Parnell
561fba7d62 fix certpath issues 2017-03-01 10:14:17 -05:00
Tommy Parnell
fe71454e65 fix readme 2017-03-01 07:29:49 -05:00
Tommy Parnell
4353bddafe fix assm version and nuspec version 2017-03-01 06:32:03 -05:00
5 changed files with 29 additions and 9 deletions

View File

@@ -1,4 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using Newtonsoft.Json;
using WixSharp;
namespace QuikPak namespace QuikPak
{ {
@@ -15,7 +17,8 @@ namespace QuikPak
public int IdleTimeout { get; set; } = 0; public int IdleTimeout { get; set; } = 0;
public string ManagedPipelineMode { get; set; } = "Integrated"; public string ManagedPipelineMode { get; set; } = "Integrated";
public string ManagedRuntimeVersion { get; set; } = "v4.0"; public string ManagedRuntimeVersion { get; set; } = "v4.0";
public bool Enable64Bits { get; set; } = false;
public bool PreserveTempFiles { get; set; } = false;
public IEnumerable<Cert> Certificates { get; set; } public IEnumerable<Cert> Certificates { get; set; }
} }
@@ -32,5 +35,7 @@ namespace QuikPak
public string Path { get; set; } public string Path { get; set; }
public string Password { get; set; } public string Password { get; set; }
[JsonIgnore]
public Binary BinaryKey { get; set; }
} }
} }

View File

@@ -76,10 +76,19 @@ namespace QuikPak
GUID = string.IsNullOrWhiteSpace(config.Id) ? Guid.NewGuid() : new Guid(config.Id), GUID = string.IsNullOrWhiteSpace(config.Id) ? Guid.NewGuid() : new Guid(config.Id),
UI = WUI.WixUI_ProgressOnly, UI = WUI.WixUI_ProgressOnly,
OutFileName = config.Name, OutFileName = config.Name,
PreserveTempFiles = true, PreserveTempFiles = config.PreserveTempFiles,
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), 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]
}; };
if(config.Enable64Bits)
{
project.Platform = Platform.x64;
}
project.Properties.Add(new Property("REINSTALLMODE", "dmus")); project.Properties.Add(new Property("REINSTALLMODE", "dmus"));
project.MajorUpgrade = new MajorUpgrade() { AllowDowngrades = true, Schedule = UpgradeSchedule.afterInstallInitialize }; project.MajorUpgrade = new MajorUpgrade() { AllowDowngrades = true, Schedule = UpgradeSchedule.afterInstallInitialize };
project.MajorUpgradeStrategy = new MajorUpgradeStrategy() project.MajorUpgradeStrategy = new MajorUpgradeStrategy()

View File

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.7.1.0")] [assembly: AssemblyVersion("0.1.0.0")]
[assembly: AssemblyFileVersion("0.7.1.0")] [assembly: AssemblyFileVersion("0.1.0.0")]

View File

@@ -5,7 +5,7 @@
<!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages --> <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
<id>quikpak</id> <id>quikpak</id>
<title>QuikPak (Install)</title> <title>QuikPak (Install)</title>
<version>$version$</version> <version>0.10.0-beta2</version>
<authors>Tommy Parnell</authors> <authors>Tommy Parnell</authors>
<owners>Tommy Parnell</owners> <owners>Tommy Parnell</owners>
<summary>quickly pack directory's as IIS websites</summary> <summary>quickly pack directory's as IIS websites</summary>
@@ -22,7 +22,7 @@
<licenseUrl>https://github.com/terribledev/QuikPak/blob/master/LICENSE.md</licenseUrl> <licenseUrl>https://github.com/terribledev/QuikPak/blob/master/LICENSE.md</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies> <dependencies>
<dependency id="wixtoolset" /> <dependency id="wixtoolset" version="3.10.3.300701" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>

View File

@@ -54,7 +54,13 @@ You can also add certificates to your json bindings.
"DnsName": "localhost", "DnsName": "localhost",
"Secure" : false "Secure" : false
} }
],
"Certificates":[
{
"Name": "MyCert",
"Path": "awesome.pfx",
"Password": "password"
}
] ]
} }
``` ```