diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-16 10:49:09 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-16 11:07:44 -0700 |
| commit | 60f75abcd1fe49052c118a2597ac59a82c372b64 (patch) | |
| tree | 1fd88e6c67846b97e61dbc3bf6f5f440516829a2 /src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | |
| parent | 1c23520ed490b56e292dc1544463af83807745ad (diff) | |
| download | wix-60f75abcd1fe49052c118a2597ac59a82c372b64.tar.gz wix-60f75abcd1fe49052c118a2597ac59a82c372b64.tar.bz2 wix-60f75abcd1fe49052c118a2597ac59a82c372b64.zip | |
Migrate PInvoke out of Core to Core.Native
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs')
| -rw-r--r-- | src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs index f8a1efd6..6446692e 100644 --- a/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs +++ b/src/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs | |||
| @@ -9,8 +9,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 9 | using System.Linq; | 9 | using System.Linq; |
| 10 | using System.Runtime.InteropServices; | 10 | using System.Runtime.InteropServices; |
| 11 | using System.Text; | 11 | using System.Text; |
| 12 | using WixToolset.Core.Native; | 12 | using WixToolset.Core.Native.Msi; |
| 13 | using WixToolset.Core.WindowsInstaller.Msi; | 13 | using WixToolset.Core.Native.Msm; |
| 14 | using WixToolset.Data; | 14 | using WixToolset.Data; |
| 15 | using WixToolset.Data.Symbols; | 15 | using WixToolset.Data.Symbols; |
| 16 | using WixToolset.Data.WindowsInstaller; | 16 | using WixToolset.Data.WindowsInstaller; |
| @@ -60,8 +60,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind | |||
| 60 | 60 | ||
| 61 | try | 61 | try |
| 62 | { | 62 | { |
| 63 | var interop = new MsmInterop(); | 63 | merge = MsmInterop.GetMsmMerge(); |
| 64 | merge = interop.GetMsmMerge(); | ||
| 65 | 64 | ||
| 66 | merge.OpenLog(logPath); | 65 | merge.OpenLog(logPath); |
| 67 | logOpen = true; | 66 | logOpen = true; |
