@joebigelow / wix / commits / 6823fa23

Optionally use IDecompileContext.CabinetExtractFolder to extract cabs.

Bob Arnson committed Dec 7, 2018 at 20:51 UTC 6823fa23d6fe2115135e7318aef6e285b3faaf45
2 files changed +3 -1
src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs
+1 -1
@@ -46,7 +46,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
46 // extract the files from the cabinets
47 if (!String.IsNullOrEmpty(this.Context.ExtractFolder) && !this.Context.SuppressExtractCabinets)
48 {
49 - var fileDirectory = Path.Combine(this.Context.ExtractFolder, "File");
49 + var fileDirectory = String.IsNullOrEmpty(this.Context.CabinetExtractFolder) ? Path.Combine(this.Context.ExtractFolder, "File") : this.Context.CabinetExtractFolder;
50
51 var extractCommand = new ExtractCabinetsCommand(output, database, this.Context.DecompilePath, fileDirectory, this.Context.IntermediateFolder, this.Context.TreatProductAsModule);
52 extractCommand.Execute();
src/WixToolset.Core/DecompileContext.cs
+2
@@ -25,6 +25,8 @@ namespace WixToolset.Core
25
26 public string ExtractFolder { get; set; }
27
28 + public string CabinetExtractFolder { get; set; }
29 +
30 public string BaseSourcePath { get; set; }
31
32 public string IntermediateFolder { get; set; }