From 60f75abcd1fe49052c118a2597ac59a82c372b64 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 16 Mar 2021 10:49:09 -0700
Subject: Migrate PInvoke out of Core to Core.Native

---
 .../Unbind/ExtractCabinetsCommand.cs                                | 2 +-
 .../Unbind/UnbindDatabaseCommand.cs                                 | 6 +++---
 .../Unbind/UnbindMsiOrMsmCommand.cs                                 | 2 +-
 .../Unbind/UnbindTranformCommand.cs                                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/WixToolset.Core.WindowsInstaller/Unbind')

diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
index f63835b8..8f52bed9 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/ExtractCabinetsCommand.cs
@@ -9,7 +9,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using System.IO;
     using System.Linq;
     using WixToolset.Core.Native;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Data.WindowsInstaller.Rows;
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
index 9a55dc77..b510690e 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using System.Globalization;
     using System.IO;
     using System.Text.RegularExpressions;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility.Services;
@@ -288,8 +288,8 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
             }
 
             ColumnDefinition[] columns;
-            using (Record columnNameRecord = tableView.GetColumnInfo(MsiInterop.MSICOLINFONAMES),
-                          columnTypeRecord = tableView.GetColumnInfo(MsiInterop.MSICOLINFOTYPES))
+            using (Record columnNameRecord = tableView.GetColumnNames(),
+                          columnTypeRecord = tableView.GetColumnTypes())
             {
                 // index the primary keys
                 var tablePrimaryKeys = new HashSet<string>();
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindMsiOrMsmCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindMsiOrMsmCommand.cs
index eea0fe23..75ee6307 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindMsiOrMsmCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindMsiOrMsmCommand.cs
@@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using System.ComponentModel;
     using WixToolset.Data;
     using WixToolset.Extensibility.Data;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
 
     internal class UnbindMsiOrMsmCommand
     {
diff --git a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
index bde29405..9f649435 100644
--- a/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Unbind/UnbindTranformCommand.cs
@@ -9,8 +9,8 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
     using System.Globalization;
     using System.IO;
     using System.Linq;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Core.WindowsInstaller.Bind;
-    using WixToolset.Core.WindowsInstaller.Msi;
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility.Services;
-- 
cgit v1.2.3-55-g6feb