diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-25 00:48:35 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-25 00:53:29 -0700 |
| commit | 9c714a8f1baa6e0130e5cd00cbdca649cebaf6a5 (patch) | |
| tree | ebf26d0e37244f3014e0c4924a29af7f7e56e2f2 /src/WixToolset.Core.Burn | |
| parent | 87580cbe111a8df836231a0192dee674cf482f08 (diff) | |
| download | wix-9c714a8f1baa6e0130e5cd00cbdca649cebaf6a5.tar.gz wix-9c714a8f1baa6e0130e5cd00cbdca649cebaf6a5.tar.bz2 wix-9c714a8f1baa6e0130e5cd00cbdca649cebaf6a5.zip | |
Update to WixOutput file structure to fix embedded file handling
Diffstat (limited to 'src/WixToolset.Core.Burn')
| -rw-r--r-- | src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs | 2 | ||||
| -rw-r--r-- | src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs | 2 |
2 files changed, 2 insertions, 2 deletions
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 | |||
| 462 | this.TrackedFiles = trackedFiles; | 462 | this.TrackedFiles = trackedFiles; |
| 463 | 463 | ||
| 464 | // TODO: Eventually this gets removed | 464 | // TODO: Eventually this gets removed |
| 465 | var intermediate = new Intermediate(this.Output.Id, new[] { section }, this.Output.Localizations.ToDictionary(l => l.Culture, StringComparer.OrdinalIgnoreCase), this.Output.EmbedFilePaths); | 465 | var intermediate = new Intermediate(this.Output.Id, new[] { section }, this.Output.Localizations.ToDictionary(l => l.Culture, StringComparer.OrdinalIgnoreCase)); |
| 466 | var trackIntermediate = this.BackendHelper.TrackFile(Path.Combine(this.IntermediateFolder, Path.GetFileName(Path.ChangeExtension(this.OutputPath, "wir"))), TrackedFileType.Intermediate); | 466 | var trackIntermediate = this.BackendHelper.TrackFile(Path.Combine(this.IntermediateFolder, Path.GetFileName(Path.ChangeExtension(this.OutputPath, "wir"))), TrackedFileType.Intermediate); |
| 467 | intermediate.Save(trackIntermediate.Path); | 467 | intermediate.Save(trackIntermediate.Path); |
| 468 | trackedFiles.Add(trackIntermediate); | 468 | 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 | |||
| 56 | // Embedded files (aka: files from binary .wixlibs) are not content files (because they are hidden | 56 | // Embedded files (aka: files from binary .wixlibs) are not content files (because they are hidden |
| 57 | // in the .wixlib). | 57 | // in the .wixlib). |
| 58 | var sourceFile = payload.SourceFile; | 58 | var sourceFile = payload.SourceFile; |
| 59 | payload.ContentFile = !sourceFile.EmbeddedFileIndex.HasValue; | 59 | payload.ContentFile = !sourceFile.Embed; |
| 60 | 60 | ||
| 61 | this.UpdatePayloadPackagingType(payload); | 61 | this.UpdatePayloadPackagingType(payload); |
| 62 | 62 | ||
