diff options
| author | Rob Mensching <rob@firegiant.com> | 2020-05-22 14:53:27 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2020-05-22 15:25:19 -0700 |
| commit | 6b30680fd7a712b45538c3f0a89d652f0457a893 (patch) | |
| tree | 46ef7f7d51de4189b7ef1af07dda3add16ad302f /src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | |
| parent | 236f958468923f65a8f02e406601fb47e71cd58e (diff) | |
| download | wix-6b30680fd7a712b45538c3f0a89d652f0457a893.tar.gz wix-6b30680fd7a712b45538c3f0a89d652f0457a893.tar.bz2 wix-6b30680fd7a712b45538c3f0a89d652f0457a893.zip | |
Support merging merge modules
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs index b90aecd1..cd6170d0 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | |||
| @@ -9,9 +9,9 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 9 | using System.Runtime.InteropServices; | 9 | using System.Runtime.InteropServices; |
| 10 | using System.Text; | 10 | using System.Text; |
| 11 | using WixToolset.Core.Bind; | 11 | using WixToolset.Core.Bind; |
| 12 | using WixToolset.Core.Native; | ||
| 12 | using WixToolset.Core.WindowsInstaller.Msi; | 13 | using WixToolset.Core.WindowsInstaller.Msi; |
| 13 | using WixToolset.Data; | 14 | using WixToolset.Data; |
| 14 | using WixToolset.Data.Tuples; | ||
| 15 | using WixToolset.Data.WindowsInstaller; | 15 | using WixToolset.Data.WindowsInstaller; |
| 16 | using WixToolset.Data.WindowsInstaller.Rows; | 16 | using WixToolset.Data.WindowsInstaller.Rows; |
| 17 | using WixToolset.Extensibility.Services; | 17 | using WixToolset.Extensibility.Services; |
| @@ -21,6 +21,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 21 | /// </summary> | 21 | /// </summary> |
| 22 | internal class MergeModulesCommand | 22 | internal class MergeModulesCommand |
| 23 | { | 23 | { |
| 24 | public MergeModulesCommand(IMessaging messaging) | ||
| 25 | { | ||
| 26 | this.Messaging = messaging; | ||
| 27 | } | ||
| 28 | |||
| 24 | public IEnumerable<FileFacade> FileFacades { private get; set; } | 29 | public IEnumerable<FileFacade> FileFacades { private get; set; } |
| 25 | 30 | ||
| 26 | public IMessaging Messaging { private get; set; } | 31 | public IMessaging Messaging { private get; set; } |
| @@ -51,7 +56,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 51 | string logPath = null; | 56 | string logPath = null; |
| 52 | try | 57 | try |
| 53 | { | 58 | { |
| 54 | merge = MsmInterop.GetMsmMerge(); | 59 | var interop = new MsmInterop(); |
| 60 | merge = interop.GetMsmMerge(); | ||
| 55 | 61 | ||
| 56 | logPath = Path.Combine(this.IntermediateFolder, "merge.log"); | 62 | logPath = Path.Combine(this.IntermediateFolder, "merge.log"); |
| 57 | merge.OpenLog(logPath); | 63 | merge.OpenLog(logPath); |
