Massive refactoring to introduce the concept of IBackend

1 files changed, 5 insertions, 4 deletions

diff --git a/src/WixToolset.Core/Bind/Databases/ExtractMergeModuleFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
index bee1488b..ae76037d 100644
--- a/src/WixToolset.Core/Bind/Databases/ExtractMergeModuleFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.Bind.Databases
+namespace WixToolset.Core.WindowsInstaller.Databases
 {
     using System;
     using System.Collections.Generic;
@@ -9,17 +9,18 @@ namespace WixToolset.Bind.Databases
     using System.IO;
     using System.Linq;
     using System.Runtime.InteropServices;
-    using WixToolset.Cab;
     using WixToolset.Data;
     using WixToolset.Data.Rows;
     using WixToolset.MergeMod;
     using WixToolset.Msi;
     using WixToolset.Core.Native;
+    using WixToolset.Core.Bind;
+    using WixToolset.Core.Cab;
 
     /// <summary>
     /// Retrieve files information and extract them from merge modules.
     /// </summary>
-    internal class ExtractMergeModuleFilesCommand : ICommand
+    internal class ExtractMergeModuleFilesCommand
     {
         public IEnumerable<FileFacade> FileFacades { private get; set; }
 
@@ -193,7 +194,7 @@ namespace WixToolset.Bind.Databases
                 string mergeIdPath = String.Concat(this.TempFilesLocation, Path.DirectorySeparatorChar, "MergeId.", safeMergeId);
                 Directory.CreateDirectory(mergeIdPath);
 
-                using (WixExtractCab extractCab = new WixExtractCab())
+                using (var extractCab = new WixExtractCab())
                 {
                     try
                     {