From d59e3d738c89c6cfd588607af9d6cb39300db15d Mon Sep 17 00:00:00 2001 From: TimBakkerVBH Date: Mon, 5 Oct 2020 19:37:10 +0200 Subject: [PATCH] Fixed: KeyPath and Guid Exception --- Version.cs | 2 +- Wax.Model/Wix/WixSourceFile.cs | 4 ++-- Wax/source.extension.vsixmanifest | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Version.cs b/Version.cs index 287b861..a45fd9a 100644 --- a/Version.cs +++ b/Version.cs @@ -16,5 +16,5 @@ internal static class Product { - public const string Version = "1.4.0.0"; + public const string Version = "1.4.1.0"; } diff --git a/Wax.Model/Wix/WixSourceFile.cs b/Wax.Model/Wix/WixSourceFile.cs index 29b18e7..60352a7 100644 --- a/Wax.Model/Wix/WixSourceFile.cs +++ b/Wax.Model/Wix/WixSourceFile.cs @@ -194,13 +194,13 @@ internal WixFileNode AddFileComponent([NotNull] WixComponentGroupNode componentG ForceDirectoryVariable(variableName, project); - var componentElement = new XElement(WixNames.ComponentNode, new XAttribute("Id", id), new XAttribute("Guid", Guid.NewGuid().ToString())); + var componentElement = new XElement(WixNames.ComponentNode, new XAttribute("Id", id), new XAttribute("Guid", Guid.NewGuid().ToString().ToUpper())); componentGroup.Node.AddWithFormatting(componentElement); var source = string.Format(CultureInfo.InvariantCulture, "$(var.{0}){1}", variableName, fileMapping.SourceName); - var fileElement = new XElement(WixNames.FileNode, new XAttribute("Id", id), new XAttribute("Name", name), new XAttribute("Source", source)); + var fileElement = new XElement(WixNames.FileNode, new XAttribute("Id", id), new XAttribute("Name", name), new XAttribute("Source", source), new XAttribute("KeyPath", "yes")); componentElement.AddWithFormatting(fileElement); diff --git a/Wax/source.extension.vsixmanifest b/Wax/source.extension.vsixmanifest index 4a03f7b..a4c8940 100644 --- a/Wax/source.extension.vsixmanifest +++ b/Wax/source.extension.vsixmanifest @@ -1,7 +1,7 @@  - + Wax An interactive WiX-Setup editor; easily maintain the files to be installed. https://github.com/tom-englert/Wax