diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-11-02 23:43:19 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@robmensching.com> | 2018-11-03 00:22:34 -0700 |
| commit | 3d49b0591a6fa2dc88c8df8915959959f81f4471 (patch) | |
| tree | d1e8f06ad4bc5fada76ea105feb7be9a0c61f9fe /src/WixToolset.Core.WindowsInstaller | |
| parent | 822d917960cbd35f506598af4baa6a20ad4b447e (diff) | |
| download | wix-3d49b0591a6fa2dc88c8df8915959959f81f4471.tar.gz wix-3d49b0591a6fa2dc88c8df8915959959f81f4471.tar.bz2 wix-3d49b0591a6fa2dc88c8df8915959959f81f4471.zip | |
Update to DecompileResult move to XDocument
Fixes wixtoolset/issues#5896
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs index 130f5ea8..80f37eb2 100644 --- a/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs | |||
| @@ -5,7 +5,6 @@ namespace WixToolset.Core.WindowsInstaller.Unbind | |||
| 5 | using System; | 5 | using System; |
| 6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
| 7 | using System.ComponentModel; | 7 | using System.ComponentModel; |
| 8 | using System.Xml.Linq; | ||
| 9 | using WixToolset.Core.Native; | 8 | using WixToolset.Core.Native; |
| 10 | using WixToolset.Data; | 9 | using WixToolset.Data; |
| 11 | using WixToolset.Extensibility; | 10 | using WixToolset.Extensibility; |
| @@ -40,10 +39,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind | |||
| 40 | var output = unbindCommand.Execute(); | 39 | var output = unbindCommand.Execute(); |
| 41 | 40 | ||
| 42 | var decompiler = new Decompiler(this.Messaging, this.Extensions, this.Context.BaseSourcePath, this.Context.SuppressCustomTables, this.Context.SuppressDroppingEmptyTables, this.Context.SuppressUI, this.Context.TreatProductAsModule); | 41 | var decompiler = new Decompiler(this.Messaging, this.Extensions, this.Context.BaseSourcePath, this.Context.SuppressCustomTables, this.Context.SuppressDroppingEmptyTables, this.Context.SuppressUI, this.Context.TreatProductAsModule); |
| 43 | var wxs = decompiler.Decompile(output); | 42 | result.Document = decompiler.Decompile(output); |
| 44 | |||
| 45 | wxs.Save(this.Context.OutputPath, SaveOptions.OmitDuplicateNamespaces); | ||
| 46 | result.SourceDocumentPath = this.Context.OutputPath; | ||
| 47 | 43 | ||
| 48 | // extract the files from the cabinets | 44 | // extract the files from the cabinets |
| 49 | if (!String.IsNullOrEmpty(this.Context.ExtractFolder) && !this.Context.SuppressExtractCabinets) | 45 | if (!String.IsNullOrEmpty(this.Context.ExtractFolder) && !this.Context.SuppressExtractCabinets) |
