aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs')
-rw-r--r--src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
index d4de2dd3..7c1e085c 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
@@ -9,12 +9,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
9 using System.IO; 9 using System.IO;
10 using System.Linq; 10 using System.Linq;
11 using System.Runtime.InteropServices; 11 using System.Runtime.InteropServices;
12 using WixToolset.Data;
13 using WixToolset.Core.Native; 12 using WixToolset.Core.Native;
13 using WixToolset.Core.Native.Msi;
14 using WixToolset.Core.Native.Msm;
15 using WixToolset.Data;
14 using WixToolset.Data.Symbols; 16 using WixToolset.Data.Symbols;
15 using WixToolset.Extensibility.Services;
16 using WixToolset.Core.WindowsInstaller.Msi;
17 using WixToolset.Extensibility.Data; 17 using WixToolset.Extensibility.Data;
18 using WixToolset.Extensibility.Services;
18 19
19 /// <summary> 20 /// <summary>
20 /// Retrieve files information and extract them from merge modules. 21 /// Retrieve files information and extract them from merge modules.
@@ -52,8 +53,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
52 { 53 {
53 var mergeModulesFileFacades = new List<IFileFacade>(); 54 var mergeModulesFileFacades = new List<IFileFacade>();
54 55
55 var interop = new MsmInterop(); 56 var merge = MsmInterop.GetMsmMerge();
56 var merge = interop.GetMsmMerge();
57 57
58 // Index all of the file rows to be able to detect collisions with files in the Merge Modules. 58 // Index all of the file rows to be able to detect collisions with files in the Merge Modules.
59 // It may seem a bit expensive to build up this index solely for the purpose of checking collisions 59 // It may seem a bit expensive to build up this index solely for the purpose of checking collisions