Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not use WiX version binding when creating template

Browse Source
This commit is contained in:
Caelan Sayler
2022-03-08 15:45:23 +00:00
parent 4895a219b9
commit 11e471fdad
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Squirrel/Internal/HelperExe.cs
View File

@@ -97,7 +97,7 @@ namespace Squirrel
if (processResult.Item1 != 0) {
var msg = String.Format(
"Failed to compile WiX template, command invoked was: '{0} {1}'\n\nOutput was:\n{2}",
"candle.exe", candleParams, processResult.Item2);
"candle.exe", Utility.ArgsToCommandLine(candleParams), processResult.Item2);
throw new Exception(msg);
}
@@ -109,7 +109,7 @@ namespace Squirrel
if (processResult.Item1 != 0) {
var msg = String.Format(
"Failed to link WiX template, command invoked was: '{0} {1}'\n\nOutput was:\n{2}",
"light.exe", lightParams, processResult.Item2);
"light.exe", Utility.ArgsToCommandLine(lightParams), processResult.Item2);
throw new Exception(msg);
}

4
src/SquirrelCli/Program.cs
View File

@@ -367,7 +367,7 @@ namespace SquirrelCli
if (!String.IsNullOrEmpty(options.msi)) {
bool x64 = options.msi.Equals("x64");
var msiPath = createMsiPackage(targetSetupExe, new ZipPackage(package), x64).Result;
var msiPath = createMsiPackage(targetSetupExe, bundledzp, x64).Result;
options.SignPEFile(msiPath);
}
@@ -387,7 +387,7 @@ namespace SquirrelCli
{ "Id", package.Id },
{ "Title", package.ProductName },
{ "Author", package.ProductCompany },
{ "Version", Regex.Replace(package.Version.ToString(), @"-.*$", "") },
{ "Version", package.Version.Version.ToString() },
{ "Summary", package.ProductDescription },
{ "Codepage", $"{culture}" },
{ "Platform", packageAs64Bit ? "x64" : "x86" },

2
vendor/wix/template.wxs vendored
View File

@@ -1,5 +1,5 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<Product Id="*" Name="{{Title}} Deployment Tool" Language="1033" Codepage="{{Codepage}}" Version="!(bind.FileVersion.{{Id}}.exe)" UpgradeCode="{{IdAsGuid1}}" Manufacturer="{{Author}}">
<Product Id="*" Name="{{Title}} Deployment Tool" Language="1033" Codepage="{{Codepage}}" Version="{{Version}}" UpgradeCode="{{IdAsGuid1}}" Manufacturer="{{Author}}">
<Package Description="This package installs a deployment tool for {{Title}}. Not {{Title}} itself. {{Title}} is only installed if a user logs into the machine." InstallScope="perMachine" Comments="Comments" InstallerVersion="200" Compressed="yes" Platform="{{Platform}}"/>
<MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A later version of this product is already installed. Setup will now exit."/>