From 8510c8891b2db107b67a94efe1011e1b513d91b4 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Wed, 5 Dec 2018 18:30:58 -0500 Subject: Extract files when using `IDecompileContext.TreatProductAsModule`. --- .../Decompile/DecompileMsiOrMsmCommand.cs | 2 +- .../Unbind/ExtractCabinetsCommand.cs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs index 80f37eb2..6ca1d89f 100644 --- a/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs @@ -44,7 +44,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind // extract the files from the cabinets if (!String.IsNullOrEmpty(this.Context.ExtractFolder) && !this.Context.SuppressExtractCabinets) { - var extractCommand = new ExtractCabinetsCommand(output, database, this.Context.DecompilePath, this.Context.ExtractFolder, this.Context.IntermediateFolder); + var extractCommand = new ExtractCabinetsCommand(output, database, this.Context.DecompilePath, this.Context.ExtractFolder, this.Context.IntermediateFolder, this.Context.TreatProductAsModule); extractCommand.Execute(); result.ExtractedFilePaths = extractCommand.ExtractedFiles; diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs index 94301727..eaed16b8 100644 --- a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs @@ -15,13 +15,14 @@ namespace WixToolset.Core.WindowsInstaller.Unbind internal class ExtractCabinetsCommand { - public ExtractCabinetsCommand(Output output, Database database, string inputFilePath, string exportBasePath, string intermediateFolder) + public ExtractCabinetsCommand(Output output, Database database, string inputFilePath, string exportBasePath, string intermediateFolder, bool treatOutputAsModule = false) { this.Output = output; this.Database = database; this.InputFilePath = inputFilePath; this.ExportBasePath = exportBasePath; this.IntermediateFolder = intermediateFolder; + this.TreatOutputAsModule = treatOutputAsModule; } public string[] ExtractedFiles { get; private set; } @@ -36,6 +37,8 @@ namespace WixToolset.Core.WindowsInstaller.Unbind private string IntermediateFolder { get; } + public bool TreatOutputAsModule { get; } + public void Execute() { var databaseBasePath = Path.GetDirectoryName(this.InputFilePath); @@ -43,7 +46,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind var embeddedCabinets = new SortedList(); // index all of the cabinet files - if (OutputType.Module == this.Output.Type) + if (OutputType.Module == this.Output.Type || this.TreatOutputAsModule) { embeddedCabinets.Add(0, "MergeModule.CABinet"); } -- cgit v1.2.3-55-g6feb