Do not use WiX version binding when creating template

clowd · Mar 8, 2022 · 11e471f · 11e471f
1 parent 4895a21
commit 11e471f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Squirrel/Internal/HelperExe.cs b/src/Squirrel/Internal/HelperExe.cs
@@ -97,7 +97,7 @@ public static async Task CompileWixTemplateToMsi(string wxsTarget, string output
                 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 @@ public static async Task CompileWixTemplateToMsi(string wxsTarget, string output
                 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);
                 }

diff --git a/src/SquirrelCli/Program.cs b/src/SquirrelCli/Program.cs
@@ -367,7 +367,7 @@ static void Releasify(ReleasifyOptions options)
 
             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 @@ static async Task<string> createMsiPackage(string setupExe, IPackage package, bo
                 { "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" },

diff --git a/vendor/wix/template.wxs b/vendor/wix/template.wxs
@@ -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."/>