From 9c714a8f1baa6e0130e5cd00cbdca649cebaf6a5 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 25 Oct 2019 00:48:35 -0700 Subject: Update to WixOutput file structure to fix embedded file handling --- src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | 2 +- src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/WixToolset.Core.Burn') diff --git a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs index 6b4b9d68..c2164744 100644 --- a/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs +++ b/src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs @@ -462,7 +462,7 @@ namespace WixToolset.Core.Burn this.TrackedFiles = trackedFiles; // TODO: Eventually this gets removed - var intermediate = new Intermediate(this.Output.Id, new[] { section }, this.Output.Localizations.ToDictionary(l => l.Culture, StringComparer.OrdinalIgnoreCase), this.Output.EmbedFilePaths); + var intermediate = new Intermediate(this.Output.Id, new[] { section }, this.Output.Localizations.ToDictionary(l => l.Culture, StringComparer.OrdinalIgnoreCase)); var trackIntermediate = this.BackendHelper.TrackFile(Path.Combine(this.IntermediateFolder, Path.GetFileName(Path.ChangeExtension(this.OutputPath, "wir"))), TrackedFileType.Intermediate); intermediate.Save(trackIntermediate.Path); trackedFiles.Add(trackIntermediate); diff --git a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs index 0560e336..17251143 100644 --- a/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs +++ b/src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs @@ -56,7 +56,7 @@ namespace WixToolset.Core.Burn.Bundles // Embedded files (aka: files from binary .wixlibs) are not content files (because they are hidden // in the .wixlib). var sourceFile = payload.SourceFile; - payload.ContentFile = !sourceFile.EmbeddedFileIndex.HasValue; + payload.ContentFile = !sourceFile.Embed; this.UpdatePayloadPackagingType(payload); -- cgit v1.2.3-55-g6feb