Migrate PInvoke out of Core to Core.Native

42 files changed, 104 insertions, 5086 deletions

diff --git a/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs b/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs
index bca1be72..ab3b7896 100644
--- a/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs
+++ b/src/WixToolset.Core.Burn/Bundles/BurnCommon.cs
@@ -111,7 +111,7 @@ namespace WixToolset.Core.Burn.Bundles
         /// <param name="fileExe">File to modify in-place.</param>
         public BurnCommon(IMessaging messaging, string fileExe)
         {
-            this.messaging = messaging;
+            this.Messaging = messaging;
             this.fileExe = fileExe;
         }
 
@@ -130,7 +130,7 @@ namespace WixToolset.Core.Burn.Bundles
         public UInt32 AttachedContainerAddress { get; protected set; }
         public UInt32 AttachedContainerSize { get; protected set; }
 
-        protected IMessaging messaging { get; }
+        protected IMessaging Messaging { get; }
 
         public void Dispose()
         {
@@ -147,12 +147,11 @@ namespace WixToolset.Core.Burn.Bundles
         /// <param name="size">Optional count of bytes to copy. 0 indicates whole input stream from current should be copied.</param>
         protected static int CopyStream(Stream input, Stream output, int size)
         {
-            byte[] bytes = new byte[4096];
-            int total = 0;
-            int read = 0;
+            var bytes = new byte[4096];
+            var total = 0;
             do
             {
-                read = Math.Min(bytes.Length, size - total);
+                var read = Math.Min(bytes.Length, size - total);
                 read = input.Read(bytes, 0, read);
                 if (0 == read)
                 {
@@ -185,21 +184,21 @@ namespace WixToolset.Core.Burn.Bundles
             uint32 = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_MAGIC);
             if (BURN_SECTION_MAGIC != uint32)
             {
-                this.messaging.Write(ErrorMessages.InvalidBundle(this.fileExe));
+                this.Messaging.Write(ErrorMessages.InvalidBundle(this.fileExe));
                 return false;
             }
 
             this.Version = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_VERSION);
             if (BURN_SECTION_VERSION != this.Version)
             {
-                this.messaging.Write(ErrorMessages.BundleTooNew(this.fileExe, this.Version));
+                this.Messaging.Write(ErrorMessages.BundleTooNew(this.fileExe, this.Version));
                 return false;
             }
 
             uint32 = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_FORMAT); // We only know how to deal with CABs right now
             if (1 != uint32)
             {
-                this.messaging.Write(ErrorMessages.InvalidBundle(this.fileExe));
+                this.Messaging.Write(ErrorMessages.InvalidBundle(this.fileExe));
                 return false;
             }
 
@@ -266,7 +265,7 @@ namespace WixToolset.Core.Burn.Bundles
 
                 if (UInt32.MaxValue == wixburnSectionOffset)
                 {
-                    this.messaging.Write(ErrorMessages.StubMissingWixburnSection(this.fileExe));
+                    this.Messaging.Write(ErrorMessages.StubMissingWixburnSection(this.fileExe));
                     return false;
                 }
 
@@ -274,7 +273,7 @@ namespace WixToolset.Core.Burn.Bundles
                 // the smallest alignment (512 bytes), but just to be paranoid...
                 if (BURN_SECTION_SIZE > BurnCommon.ReadUInt32(bytes, IMAGE_SECTION_HEADER_OFFSET_SIZEOFRAWDATA))
                 {
-                    this.messaging.Write(ErrorMessages.StubWixburnSectionTooSmall(this.fileExe));
+                    this.Messaging.Write(ErrorMessages.StubWixburnSectionTooSmall(this.fileExe));
                     return false;
                 }
 
@@ -303,7 +302,7 @@ namespace WixToolset.Core.Burn.Bundles
                 // Verify the NT signature...
                 if (IMAGE_NT_SIGNATURE != BurnCommon.ReadUInt32(bytes, IMAGE_NT_HEADER_OFFSET_SIGNATURE))
                 {
-                    this.messaging.Write(ErrorMessages.InvalidStubExe(this.fileExe));
+                    this.Messaging.Write(ErrorMessages.InvalidStubExe(this.fileExe));
                     return false;
                 }
 
@@ -338,7 +337,7 @@ namespace WixToolset.Core.Burn.Bundles
                 // Verify the DOS 'MZ' signature.
                 if (IMAGE_DOS_SIGNATURE != BurnCommon.ReadUInt16(bytes, IMAGE_DOS_HEADER_OFFSET_MAGIC))
                 {
-                    this.messaging.Write(ErrorMessages.InvalidStubExe(this.fileExe));
+                    this.Messaging.Write(ErrorMessages.InvalidStubExe(this.fileExe));
                     return false;
                 }
 
diff --git a/src/WixToolset.Core.Burn/Bundles/BurnReader.cs b/src/WixToolset.Core.Burn/Bundles/BurnReader.cs
index 68fdea1c..5b06b31e 100644
--- a/src/WixToolset.Core.Burn/Bundles/BurnReader.cs
+++ b/src/WixToolset.Core.Burn/Bundles/BurnReader.cs
@@ -27,7 +27,7 @@ namespace WixToolset.Core.Burn.Bundles
 
         private bool invalidBundle;
         private BinaryReader binaryReader;
-        private List<DictionaryEntry> attachedContainerPayloadNames;
+        private readonly List<DictionaryEntry> attachedContainerPayloadNames;
 
         /// <summary>
         /// Creates a BurnReader for reading a PE file.
@@ -43,13 +43,7 @@ namespace WixToolset.Core.Burn.Bundles
         /// <summary>
         /// Gets the underlying stream.
         /// </summary>
-        public Stream Stream
-        {
-            get
-            {
-                return (null != this.binaryReader) ? this.binaryReader.BaseStream : null;
-            }
-        }
+        public Stream Stream => this.binaryReader?.BaseStream;
 
         internal static BurnReader Open(object inputFilePath)
         {
@@ -64,7 +58,7 @@ namespace WixToolset.Core.Burn.Bundles
         /// <returns>Burn reader.</returns>
         public static BurnReader Open(IMessaging messaging, string fileExe)
         {
-            BurnReader reader = new BurnReader(messaging, fileExe);
+            var reader = new BurnReader(messaging, fileExe);
 
             reader.binaryReader = new BinaryReader(File.Open(fileExe, FileMode.Open, FileAccess.Read, FileShare.Read | FileShare.Delete));
             if (!reader.Initialize(reader.binaryReader))
@@ -109,8 +103,7 @@ namespace WixToolset.Core.Burn.Bundles
             cabinet.Extract(outputDirectory);
 
             Directory.CreateDirectory(Path.GetDirectoryName(manifestPath));
-            File.Delete(manifestPath);
-            File.Move(manifestOriginalPath, manifestPath);
+            FileSystem.MoveFile(manifestOriginalPath, manifestPath);
 
             XmlDocument document = new XmlDocument();
             document.Load(manifestPath);
@@ -128,8 +121,7 @@ namespace WixToolset.Core.Burn.Bundles
                 string destinationPath = Path.Combine(outputDirectory, filePathNode.Value);
 
                 Directory.CreateDirectory(Path.GetDirectoryName(destinationPath));
-                File.Delete(destinationPath);
-                File.Move(sourcePath, destinationPath);
+                FileSystem.MoveFile(sourcePath, destinationPath);
             }
 
             foreach (XmlNode payload in payloads)
@@ -193,8 +185,7 @@ namespace WixToolset.Core.Burn.Bundles
                 string destinationPath = Path.Combine(outputDirectory, (string)entry.Value);
 
                 Directory.CreateDirectory(Path.GetDirectoryName(destinationPath));
-                File.Delete(destinationPath);
-                File.Move(sourcePath, destinationPath);
+                FileSystem.MoveFile(sourcePath, destinationPath);
             }
 
             return true;
diff --git a/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs b/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs
index be9b8eaa..2d16d11c 100644
--- a/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs
+++ b/src/WixToolset.Core.Burn/Bundles/BurnWriter.cs
@@ -80,7 +80,7 @@ namespace WixToolset.Core.Burn.Bundles
             this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_MAGIC, BURN_SECTION_MAGIC);
             this.WriteToBurnSectionOffset(BURN_SECTION_OFFSET_VERSION, BURN_SECTION_VERSION);
 
-            this.messaging.Write(VerboseMessages.BundleGuid(bundleId));
+            this.Messaging.Write(VerboseMessages.BundleGuid(bundleId));
             this.binaryWriter.BaseStream.Seek(this.wixburnDataOffset + BURN_SECTION_OFFSET_BUNDLEGUID, SeekOrigin.Begin);
             this.binaryWriter.Write(bundleGuid.ToByteArray());
 
diff --git a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
index 66257ce3..b802f556 100644
--- a/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
+++ b/src/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
@@ -8,6 +8,7 @@ namespace WixToolset.Core.Burn.Bundles
     using System.Reflection;
     using System.Text;
     using System.Xml;
+    using WixToolset.Core.Native;
     using WixToolset.Data;
     using WixToolset.Data.Burn;
     using WixToolset.Data.Symbols;
@@ -72,7 +73,7 @@ namespace WixToolset.Core.Burn.Bundles
 
             this.Transfer = this.BackendHelper.CreateFileTransfer(bundleTempPath, this.OutputPath, true, this.BundleSymbol.SourceLineNumbers);
 
-            File.Copy(stubFile, bundleTempPath, true);
+            FileSystem.CopyFile(stubFile, bundleTempPath, allowHardlink: false);
             File.SetAttributes(bundleTempPath, FileAttributes.Normal);
 
             var windowsAssemblyVersion = GetWindowsAssemblyVersion(this.BundleSymbol);
diff --git a/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs b/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs
index e87f4360..b466d0de 100644
--- a/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs
+++ b/src/WixToolset.Core.Burn/Inscribe/InscribeBundleCommand.cs
@@ -1,10 +1,10 @@
-// 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.
+// 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.Core.Burn.Inscribe
 {
     using System.IO;
     using WixToolset.Core.Burn.Bundles;
-    using WixToolset.Extensibility;
+    using WixToolset.Core.Native;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
 
@@ -23,19 +23,19 @@ namespace WixToolset.Core.Burn.Inscribe
 
         public bool Execute()
         {
-            bool inscribed = false;
-            string tempFile = Path.Combine(this.Context.IntermediateFolder, "bundle_engine_signed.exe");
+            var inscribed = false;
+            var tempFile = Path.Combine(this.Context.IntermediateFolder, "bundle_engine_signed.exe");
 
-            using (BurnReader reader = BurnReader.Open(this.Context.InputFilePath))
+            using (var reader = BurnReader.Open(this.Context.InputFilePath))
             {
-                File.Copy(this.Context.SignedEngineFile, tempFile, true);
+                FileSystem.CopyFile(this.Context.SignedEngineFile, tempFile, allowHardlink: false);
 
                 // If there was an attached container on the original (unsigned) bundle, put it back.
                 if (reader.AttachedContainerSize > 0)
                 {
                     reader.Stream.Seek(reader.AttachedContainerAddress, SeekOrigin.Begin);
 
-                    using (BurnWriter writer = BurnWriter.Open(this.Messaging, tempFile))
+                    using (var writer = BurnWriter.Open(this.Messaging, tempFile))
                     {
                         writer.RememberThenResetSignature();
                         writer.AppendContainer(reader.Stream, reader.AttachedContainerSize, BurnCommon.Container.Attached);
@@ -45,13 +45,8 @@ namespace WixToolset.Core.Burn.Inscribe
             }
 
             Directory.CreateDirectory(Path.GetDirectoryName(this.Context.OutputFile));
-            if (File.Exists(this.Context.OutputFile))
-            {
-                File.Delete(this.Context.OutputFile);
-            }
 
-            File.Move(tempFile, this.Context.OutputFile);
-            WixToolset.Core.Native.NativeMethods.ResetAcls(new string[] { this.Context.OutputFile }, 1);
+            FileSystem.MoveFile(tempFile, this.Context.OutputFile);
 
             return inscribed;
         }
diff --git a/src/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs b/src/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs
index 37f64312..a6789796 100644
--- a/src/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs
+++ b/src/WixToolset.Core.Burn/Inscribe/InscribeBundleEngineCommand.cs
@@ -1,33 +1,40 @@
-// 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.
+// 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.Core.Burn.Inscribe
 {
     using System;
     using System.IO;
     using WixToolset.Core.Burn.Bundles;
+    using WixToolset.Core.Native;
     using WixToolset.Extensibility.Data;
 
     internal class InscribeBundleEngineCommand
     {
         public InscribeBundleEngineCommand(IInscribeContext context)
         {
-            this.Context = context;
+            this.IntermediateFolder = context.IntermediateFolder;
+            this.InputFilePath = context.InputFilePath;
+            this.OutputFile = context.OutputFile;
         }
 
-        private IInscribeContext Context { get; }
+        private string IntermediateFolder { get; }
+
+        private string InputFilePath { get; }
+
+        private string OutputFile { get; }
 
         public bool Execute()
         {
-            string tempFile = Path.Combine(this.Context.IntermediateFolder, "bundle_engine_unsigned.exe");
+            var tempFile = Path.Combine(this.IntermediateFolder, "bundle_engine_unsigned.exe");
 
-            using (BurnReader reader = BurnReader.Open(this.Context.InputFilePath))
-            using (FileStream writer = File.Open(tempFile, FileMode.Create, FileAccess.Write, FileShare.Read | FileShare.Delete))
+            using (var reader = BurnReader.Open(this.InputFilePath))
+            using (var writer = File.Open(tempFile, FileMode.Create, FileAccess.Write, FileShare.Read | FileShare.Delete))
             {
                 reader.Stream.Seek(0, SeekOrigin.Begin);
 
-                byte[] buffer = new byte[4 * 1024];
-                int total = 0;
-                int read = 0;
+                var buffer = new byte[4 * 1024];
+                var total = 0;
+                var read = 0;
                 do
                 {
                     read = Math.Min(buffer.Length, (int)reader.EngineSize - total);
@@ -46,14 +53,9 @@ namespace WixToolset.Core.Burn.Inscribe
                 // TODO: update writer with detached container signatures.
             }
 
-            Directory.CreateDirectory(Path.GetDirectoryName(this.Context.OutputFile));
-            if (File.Exists(this.Context.OutputFile))
-            {
-                File.Delete(this.Context.OutputFile);
-            }
+            Directory.CreateDirectory(Path.GetDirectoryName(this.OutputFile));
 
-            File.Move(tempFile, this.Context.OutputFile);
-            WixToolset.Core.Native.NativeMethods.ResetAcls(new string[] { this.Context.OutputFile }, 1);
+            FileSystem.MoveFile(tempFile, this.OutputFile);
 
             return true;
         }
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
index b2052b90..6d802d98 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/AttachPatchTransformsCommand.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.Globalization;
     using System.Linq;
     using System.Text.RegularExpressions;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
index 28e1d9ee..3a9bd545 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
@@ -5,7 +5,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System;
     using System.Globalization;
     using System.IO;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ConfigurationCallback.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ConfigurationCallback.cs
deleted file mode 100644
index 9a609463..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ConfigurationCallback.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// 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.Core.WindowsInstaller.Bind
-{
-    using System;
-    using System.Collections;
-    using System.Globalization;
-    using WixToolset.Core.Native;
-    using WixToolset.Core.WindowsInstaller.Msi;
-
-    /// <summary>
-    /// Callback object for configurable merge modules.
-    /// </summary>
-    internal sealed class ConfigurationCallback : IMsmConfigureModule
-    {
-        private const int SOk = 0x0;
-        private const int SFalse = 0x1;
-        private Hashtable configurationData;
-
-        /// <summary>
-        /// Creates a ConfigurationCallback object.
-        /// </summary>
-        /// <param name="configData">String to break up into name/value pairs.</param>
-        public ConfigurationCallback(string configData)
-        {
-            if (String.IsNullOrEmpty(configData))
-            {
-                throw new ArgumentNullException("configData");
-            }
-
-            string[] pairs = configData.Split(',');
-            this.configurationData = new Hashtable(pairs.Length);
-            for (int i = 0; i < pairs.Length; ++i)
-            {
-                string[] nameVal = pairs[i].Split('=');
-                string name = nameVal[0];
-                string value = nameVal[1];
-
-                name = name.Replace("%2C", ",");
-                name = name.Replace("%3D", "=");
-                name = name.Replace("%25", "%");
-
-                value = value.Replace("%2C", ",");
-                value = value.Replace("%3D", "=");
-                value = value.Replace("%25", "%");
-
-                this.configurationData[name] = value;
-            }
-        }
-
-        /// <summary>
-        /// Returns text data based on name.
-        /// </summary>
-        /// <param name="name">Name of value to return.</param>
-        /// <param name="configData">Out param to put configuration data into.</param>
-        /// <returns>S_OK if value provided, S_FALSE if not.</returns>
-        public int ProvideTextData(string name, out string configData)
-        {
-            if (this.configurationData.Contains(name))
-            {
-                configData = (string)this.configurationData[name];
-                return SOk;
-            }
-            else
-            {
-                configData = null;
-                return SFalse;
-            }
-        }
-
-        /// <summary>
-        /// Returns integer data based on name.
-        /// </summary>
-        /// <param name="name">Name of value to return.</param>
-        /// <param name="configData">Out param to put configuration data into.</param>
-        /// <returns>S_OK if value provided, S_FALSE if not.</returns>
-        public int ProvideIntegerData(string name, out int configData)
-        {
-            if (this.configurationData.Contains(name))
-            {
-                string val = (string)this.configurationData[name];
-                configData = Convert.ToInt32(val, CultureInfo.InvariantCulture);
-                return SOk;
-            }
-            else
-            {
-                configData = 0;
-                return SFalse;
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateInstanceTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateInstanceTransformsCommand.cs
index 9a631754..d0e25571 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateInstanceTransformsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateInstanceTransformsCommand.cs
@@ -5,7 +5,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs
index 7bc1a8bd..5c993f63 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreatePatchTransformsCommand.cs
@@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Core.WindowsInstaller.Unbind;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
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
     using System.IO;
     using System.Linq;
     using System.Runtime.InteropServices;
-    using WixToolset.Data;
     using WixToolset.Core.Native;
+    using WixToolset.Core.Native.Msi;
+    using WixToolset.Core.Native.Msm;
+    using WixToolset.Data;
     using WixToolset.Data.Symbols;
-    using WixToolset.Extensibility.Services;
-    using WixToolset.Core.WindowsInstaller.Msi;
     using WixToolset.Extensibility.Data;
+    using WixToolset.Extensibility.Services;
 
     /// <summary>
     /// Retrieve files information and extract them from merge modules.
@@ -52,8 +53,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         {
             var mergeModulesFileFacades = new List<IFileFacade>();
 
-            var interop = new MsmInterop();
-            var merge = interop.GetMsmMerge();
+            var merge = MsmInterop.GetMsmMerge();
 
             // Index all of the file rows to be able to detect collisions with files in the Merge Modules.
             // It may seem a bit expensive to build up this index solely for the purpose of checking collisions
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
index d3c65b6a..06fbf072 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateDatabaseCommand.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.IO;
     using System.Linq;
     using System.Text;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility.Data;
@@ -337,7 +337,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                                 }
 
                                 // check for a stream name that is more than 62 characters long (the maximum allowed length)
-                                if (needStream && MsiInterop.MsiMaxStreamNameLength < streamName.Length)
+                                if (needStream && Database.MsiMaxStreamNameLength < streamName.Length)
                                 {
                                     this.Messaging.Write(ErrorMessages.StreamNameTooLong(row.SourceLineNumbers, table.Name, streamName.ToString(), streamName.Length));
                                 }
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs
index 6dcb1096..ef141795 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs
@@ -5,7 +5,7 @@ namespace WixToolset.Core.WindowsInstaller
     using System;
     using System.Collections.Generic;
     using System.Globalization;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
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
     using System.Linq;
     using System.Runtime.InteropServices;
     using System.Text;
-    using WixToolset.Core.Native;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
+    using WixToolset.Core.Native.Msm;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
@@ -60,8 +60,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             try
             {
-                var interop = new MsmInterop();
-                merge = interop.GetMsmMerge();
+                merge = MsmInterop.GetMsmMerge();
 
                 merge.OpenLog(logPath);
                 logOpen = true;
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
index 8c66a9e1..039ba495 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
@@ -6,7 +6,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Data;
diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
index 9cd14cfa..0f77abfc 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
@@ -8,7 +8,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
     using System.Globalization;
     using System.IO;
     using System.Linq;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Data;
diff --git a/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs b/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs
index 849cb361..aeda4443 100644
--- a/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Decompile/DecompileMsiOrMsmCommand.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
     using System.ComponentModel;
     using System.IO;
     using System.Linq;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Core.WindowsInstaller.Unbind;
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
diff --git a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
index 19869cfa..57f2f753 100644
--- a/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
@@ -8,8 +8,8 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
     using System.IO;
     using System.Runtime.InteropServices;
     using System.Security.Cryptography.X509Certificates;
+    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.Data;
@@ -150,7 +150,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
                         Row digitalSignatureRow = null;
 
                         var cabName = mediaRecord.GetString(4); // get the name of the cab
-                                                                   // If there is no cabinet or it's an internal cab, skip it.
+                                                                // If there is no cabinet or it's an internal cab, skip it.
                         if (String.IsNullOrEmpty(cabName) || cabName.StartsWith("#", StringComparison.Ordinal))
                         {
                             continue;
diff --git a/src/WixToolset.Core.WindowsInstaller/MergeMod/NativeMethods.cs b/src/WixToolset.Core.WindowsInstaller/MergeMod/NativeMethods.cs
deleted file mode 100644
index daf259b4..00000000
--- a/src/WixToolset.Core.WindowsInstaller/MergeMod/NativeMethods.cs
+++ /dev/null
@@ -1,508 +0,0 @@
-// 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.
-#if false
-namespace WixToolset.MergeMod
-{
-    using System;
-    using System.Collections;
-    using System.Runtime.CompilerServices;
-    using System.Runtime.InteropServices;
-
-    /// <summary>
-    /// Errors returned by merge operations.
-    /// </summary>
-    [Guid("0ADDA825-2C26-11D2-AD65-00A0C9AF11A6")]
-    internal enum MsmErrorType
-    {
-        /// <summary>
-        /// A request was made to open a module with a language not supported by the module.
-        /// No more general language is supported by the module.
-        /// Adds msmErrorLanguageUnsupported to the Type property and the requested language
-        /// to the Language Property (Error Object).  All Error object properties are empty.
-        /// The OpenModule function returns ERROR_INSTALL_LANGUAGE_UNSUPPORTED (as HRESULT).
-        /// </summary>
-        msmErrorLanguageUnsupported = 1,
-
-        /// <summary>
-        /// A request was made to open a module with a supported language but the module has
-        /// an invalid language transform.  Adds msmErrorLanguageFailed to the Type property
-        /// and the applied transform's language to the Language Property of the Error object.
-        /// This may not be the requested language if a more general language was used.
-        /// All other properties of the Error object are empty.  The OpenModule function
-        /// returns ERROR_INSTALL_LANGUAGE_UNSUPPORTED (as HRESULT).
-        /// </summary>
-        msmErrorLanguageFailed = 2,
-
-        /// <summary>
-        /// The module cannot be merged because it excludes, or is excluded by, another module
-        /// in the database.  Adds msmErrorExclusion to the Type property of the Error object.
-        /// The ModuleKeys property or DatabaseKeys property contains the primary keys of the
-        /// excluded module's row in the ModuleExclusion table.  If an existing module excludes
-        /// the module being merged, the excluded module's ModuleSignature information is added
-        /// to ModuleKeys.  If the module being merged excludes an existing module, DatabaseKeys
-        /// contains the excluded module's ModuleSignature information.  All other properties
-        /// are empty (or -1).
-        /// </summary>
-        msmErrorExclusion = 3,
-
-        /// <summary>
-        /// Merge conflict during merge.  The value of the Type property is set to
-        /// msmErrorTableMerge.  The DatabaseTable property and DatabaseKeys property contain
-        /// the table name and primary keys of the conflicting row in the database.  The
-        /// ModuleTable property and ModuleKeys property contain the table name and primary keys
-        /// of the conflicting row in the module.  The ModuleTable and ModuleKeys entries may be
-        /// null if the row does not exist in the database.  For example, if the conflict is in a
-        /// generated FeatureComponents table entry.  On Windows Installer version 2.0, when
-        /// merging a configurable merge module, configuration may cause these properties to
-        /// refer to rows that do not exist in the module.
-        /// </summary>
-        msmErrorTableMerge = 4,
-
-        /// <summary>
-        /// There was a problem resequencing a sequence table to contain the necessary merged
-        /// actions.  The Type property is set to msmErrorResequenceMerge. The DatabaseTable
-        /// and DatabaseKeys properties contain the sequence table name and primary keys
-        /// (action name) of the conflicting row.  The ModuleTable and ModuleKeys properties
-        /// contain the sequence table name and primary key (action name) of the conflicting row.
-        /// On Windows Installer version 2.0, when merging a configurable merge module,
-        /// configuration may cause these properties to refer to rows that do not exist in the module.
-        /// </summary>
-        msmErrorResequenceMerge = 5,
-
-        /// <summary>
-        /// Not used.
-        /// </summary>
-        msmErrorFileCreate = 6,
-
-        /// <summary>
-        /// There was a problem creating a directory to extract a file to disk.  The Path property
-        /// contains the directory that could not be created.  All other properties are empty or -1.
-        /// Not available with Windows Installer version 1.0.
-        /// </summary>
-        msmErrorDirCreate = 7,
-
-        /// <summary>
-        /// A feature name is required to complete the merge, but no feature name was provided.
-        /// The Type property is set to msmErrorFeatureRequired.  The DatabaseTable and DatabaseKeys
-        /// contain the table name and primary keys of the conflicting row.  The ModuleTable and
-        /// ModuleKeys properties contain the table name and primary keys of the row cannot be merged.
-        /// On Windows Installer version 2.0, when merging a configurable merge module, configuration
-        /// may cause these properties to refer to rows that do not exist in the module.
-        /// If the failure is in a generated FeatureComponents table, the DatabaseTable and
-        /// DatabaseKeys properties are empty and the ModuleTable and ModuleKeys properties refer to
-        /// the row in the Component table causing the failure.
-        /// </summary>
-        msmErrorFeatureRequired = 8,
-
-        /// <summary>
-        /// Available with Window Installer version 2.0. Substitution of a Null value into a
-        /// non-nullable column.  This enters msmErrorBadNullSubstitution in the Type property and
-        /// enters "ModuleSubstitution" and the keys from the ModuleSubstitution table for this row
-        /// into the ModuleTable property and ModuleKeys property.  All other properties of the Error
-        /// object are set to an empty string or -1.  This error causes the immediate failure of the
-        /// merge and the MergeEx function to return E_FAIL.
-        /// </summary>
-        msmErrorBadNullSubstitution = 9,
-
-        /// <summary>
-        /// Available with Window Installer version 2.0.  Substitution of Text Format Type or Integer
-        /// Format Type into a Binary Type data column.  This type of error returns
-        /// msmErrorBadSubstitutionType in the Type property and enters "ModuleSubstitution" and the
-        /// keys from the ModuleSubstitution table for this row into the ModuleTable property.
-        /// All other properties of the Error object are set to an empty string or -1.  This error
-        /// causes the immediate failure of the merge and the MergeEx function to return E_FAIL.
-        /// </summary>
-        msmErrorBadSubstitutionType = 10,
-
-        /// <summary>
-        /// Available with Window Installer Version 2.0.  A row in the ModuleSubstitution table
-        /// references a configuration item not defined in the ModuleConfiguration table.
-        /// This type of error returns msmErrorMissingConfigItem in the Type property and enters
-        /// "ModuleSubstitution" and the keys from the ModuleSubstitution table for this row into
-        /// the ModuleTable property. All other properties of the Error object are set to an empty
-        /// string or -1.  This error causes the immediate failure of the merge and the MergeEx
-        /// function to return E_FAIL.
-        /// </summary>
-        msmErrorMissingConfigItem = 11,
-
-        /// <summary>
-        /// Available with Window Installer version 2.0.  The authoring tool has returned a Null
-        /// value for an item marked with the msmConfigItemNonNullable attribute.  An error of this
-        /// type returns msmErrorBadNullResponse in the Type property and enters "ModuleSubstitution"
-        /// and the keys from the ModuleSubstitution table for for the item into the ModuleTable property.
-        /// All other properties of the Error object are set to an empty string or -1.  This error
-        /// causes the immediate failure of the merge and the MergeEx function to return E_FAIL.
-        /// </summary>
-        msmErrorBadNullResponse = 12,
-
-        /// <summary>
-        /// Available with Window Installer version 2.0.  The authoring tool returned a failure code
-        /// (not S_OK or S_FALSE) when asked for data. An error of this type will return
-        /// msmErrorDataRequestFailed in the Type property and enters "ModuleSubstitution"
-        /// and the keys from the ModuleSubstitution table for the item into the ModuleTable property.
-        /// All other properties of the Error object are set to an empty string or -1.  This error
-        /// causes the immediate failure of the merge and the MergeEx function to return E_FAIL.
-        /// </summary>
-        msmErrorDataRequestFailed = 13,
-
-        /// <summary>
-        /// Available with Windows Installer 2.0 and later versions.  Indicates that an attempt was
-        /// made to merge a 64-bit module into a package that was not a 64-bit package.  An error of
-        /// this type returns msmErrorPlatformMismatch in the Type property.  All other properties of
-        /// the error object are set to an empty string or -1. This error causes the immediate failure
-        /// of the merge and causes the Merge function or MergeEx function to return E_FAIL.
-        /// </summary>
-        msmErrorPlatformMismatch = 14,
-    }
-
-    /// <summary>
-    /// IMsmMerge2 interface.
-    /// </summary>
-    [ComImport, Guid("351A72AB-21CB-47ab-B7AA-C4D7B02EA305")]
-    internal interface IMsmMerge2
-    {
-        /// <summary>
-        /// The OpenDatabase method of the Merge object opens a Windows Installer installation
-        /// database, located at a specified path, that is to be merged with a module.
-        /// </summary>
-        /// <param name="path">Path to the database being opened.</param>
-        void OpenDatabase(string path);
-
-        /// <summary>
-        /// The OpenModule method of the Merge object opens a Windows Installer merge module
-        /// in read-only mode. A module must be opened before it can be merged with an installation database.
-        /// </summary>
-        /// <param name="fileName">Fully qualified file name pointing to a merge module.</param>
-        /// <param name="language">A valid language identifier (LANGID).</param>
-        void OpenModule(string fileName, short language);
-
-        /// <summary>
-        /// The CloseDatabase method of the Merge object closes the currently open Windows Installer database.
-        /// </summary>
-        /// <param name="commit">true if changes should be saved, false otherwise.</param>
-        void CloseDatabase(bool commit);
-
-        /// <summary>
-        /// The CloseModule method of the Merge object closes the currently open Windows Installer merge module.
-        /// </summary>
-        void CloseModule();
-
-        /// <summary>
-        /// The OpenLog method of the Merge object opens a log file that receives progress and error messages.
-        /// If the log file already exists, the installer appends new messages. If the log file does not exist,
-        /// the installer creates a log file.
-        /// </summary>
-        /// <param name="fileName">Fully qualified filename pointing to a file to open or create.</param>
-        void OpenLog(string fileName);
-
-        /// <summary>
-        /// The CloseLog method of the Merge object closes the current log file.
-        /// </summary>
-        void CloseLog();
-
-        /// <summary>
-        /// The Log method of the Merge object writes a text string to the currently open log file.
-        /// </summary>
-        /// <param name="message">The text string to display.</param>
-        void Log(string message);
-
-        /// <summary>
-        /// Gets the errors from the last merge operation.
-        /// </summary>
-        /// <value>The errors from the last merge operation.</value>
-        IMsmErrors Errors
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets a collection of Dependency objects that enumerates a set of unsatisfied dependencies for the current database.
-        /// </summary>
-        /// <value>A  collection of Dependency objects that enumerates a set of unsatisfied dependencies for the current database.</value>
-        object Dependencies
-        {
-            get;
-        }
-
-        /// <summary>
-        /// The Merge method of the Merge object executes a merge of the current database and current
-        /// module. The merge attaches the components in the module to the feature identified by Feature.
-        /// The root of the module's directory tree is redirected to the location given by RedirectDir.
-        /// </summary>
-        /// <param name="feature">The name of a feature in the database.</param>
-        /// <param name="redirectDir">The key of an entry in the Directory table of the database.
-        /// This parameter may be NULL or an empty string.</param>
-        void Merge(string feature, string redirectDir);
-
-        /// <summary>
-        /// The Connect method of the Merge object connects a module to an additional feature.
-        /// The module must have already been merged into the database or will be merged into the database.
-        /// The feature must exist before calling this function.
-        /// </summary>
-        /// <param name="feature">The name of a feature already existing in the database.</param>
-        void Connect(string feature);
-
-        /// <summary>
-        /// The ExtractCAB method of the Merge object extracts the embedded .cab file from a module and
-        /// saves it as the specified file. The installer creates this file if it does not already exist
-        /// and overwritten if it does exist.
-        /// </summary>
-        /// <param name="fileName">The fully qualified destination file.</param>
-        void ExtractCAB(string fileName);
-
-        /// <summary>
-        /// The ExtractFiles method of the Merge object extracts the embedded .cab file from a module
-        /// and then writes those files to the destination directory.
-        /// </summary>
-        /// <param name="path">The fully qualified destination directory.</param>
-        void ExtractFiles(string path);
-
-        /// <summary>
-        /// The MergeEx method of the Merge object is equivalent to the Merge function, except that it
-        /// takes an extra argument.  The Merge method executes a merge of the current database and
-        /// current module. The merge attaches the components in the module to the feature identified
-        /// by Feature. The root of the module's directory tree is redirected to the location given by RedirectDir.
-        /// </summary>
-        /// <param name="feature">The name of a feature in the database.</param>
-        /// <param name="redirectDir">The key of an entry in the Directory table of the database. This parameter may
-        /// be NULL or an empty string.</param>
-        /// <param name="configuration">The pConfiguration argument is an interface implemented by the client. The argument may
-        /// be NULL. The presence of this argument indicates that the client is capable of supporting the configuration
-        /// functionality, but does not obligate the client to provide configuration data for any specific configurable item.</param>
-        void MergeEx(string feature, string redirectDir, IMsmConfigureModule configuration);
-
-        /// <summary>
-        /// The ExtractFilesEx method of the Merge object extracts the embedded .cab file from a module and
-        /// then writes those files to the destination directory.
-        /// </summary>
-        /// <param name="path">The fully qualified destination directory.</param>
-        /// <param name="longFileNames">Set to specify using long file names for path segments and final file names.</param>
-        /// <param name="filePaths">This is a list of fully-qualified paths for the files that were successfully extracted.
-        /// The list is empty if no files can be extracted.  This argument may be null.  No list is provided if pFilePaths is null.</param>
-        void ExtractFilesEx(string path, bool longFileNames, ref IntPtr filePaths);
-
-        /// <summary>
-        /// Gets a collection ConfigurableItem objects, each of which represents a single row from the ModuleConfiguration table.
-        /// </summary>
-        /// <value>A collection ConfigurableItem objects, each of which represents a single row from the ModuleConfiguration table.</value>
-        /// <remarks>Semantically, each interface in the enumerator represents an item that can be configured by the module consumer.
-        /// The collection is a read-only collection and implements the standard read-only collection interfaces of Item(), Count() and _NewEnum().
-        /// The IEnumMsmConfigItems enumerator implements Next(), Skip(), Reset(), and Clone() with the standard semantics.</remarks>
-        object ConfigurableItems
-        {
-            get;
-        }
-
-        /// <summary>
-        /// The CreateSourceImage method of the Merge object allows the client to extract the files from a module to
-        /// a source image on disk after a merge, taking into account changes to the module that might have been made
-        /// during module configuration. The list of files to be extracted is taken from the file table of the module
-        /// during the merge process. The list of files consists of every file successfully copied from the file table
-        /// of the module to the target database. File table entries that were not copied due to primary key conflicts
-        /// with existing rows in the database are not a part of this list. At image creation time, the directory for
-        /// each of these files comes from the open (post-merge) database. The path specified in the Path parameter is
-        /// the root of the source image for the install. fLongFileNames determines whether or not long file names are
-        /// used for both path segments and final file names. The function fails if no database is open, no module is
-        /// open, or no merge has been performed.
-        /// </summary>
-        /// <param name="path">The path of the root of the source image for the install.</param>
-        /// <param name="longFileNames">Determines whether or not long file names are used for both path segments and final file names. </param>
-        /// <param name="filePaths">This is a list of fully-qualified paths for the files that were successfully extracted.
-        /// The list is empty if no files can be extracted.  This argument may be null.  No list is provided if pFilePaths is null.</param>
-        void CreateSourceImage(string path, bool longFileNames, ref IntPtr filePaths);
-
-        /// <summary>
-        /// The get_ModuleFiles function implements the ModuleFiles property of the GetFiles object. This function
-        /// returns the primary keys in the File table of the currently open module. The primary keys are returned
-        /// as a collection of strings. The module must be opened by a call to the OpenModule function before calling get_ModuleFiles.
-        /// </summary>
-        IMsmStrings ModuleFiles
-        {
-            get;
-        }
-    }
-
-    /// <summary>
-    /// Collection of merge errors.
-    /// </summary>
-    [ComImport, Guid("0ADDA82A-2C26-11D2-AD65-00A0C9AF11A6")]
-    internal interface IMsmErrors
-    {
-        /// <summary>
-        /// Gets the IMsmError at the specified index.
-        /// </summary>
-        /// <param name="index">The one-based index of the IMsmError to get.</param>
-        IMsmError this[int index]
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the count of IMsmErrors in this collection.
-        /// </summary>
-        /// <value>The count of IMsmErrors in this collection.</value>
-        int Count
-        {
-            get;
-        }
-    }
-
-    /// <summary>
-    /// A merge error.
-    /// </summary>
-    [ComImport, Guid("0ADDA828-2C26-11D2-AD65-00A0C9AF11A6")]
-    internal interface IMsmError
-    {
-        /// <summary>
-        /// Gets the type of merge error.
-        /// </summary>
-        /// <value>The type of merge error.</value>
-        MsmErrorType Type
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the path information from the merge error.
-        /// </summary>
-        /// <value>The path information from the merge error.</value>
-        string Path
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the language information from the merge error.
-        /// </summary>
-        /// <value>The language information from the merge error.</value>
-        short Language
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the database table from the merge error.
-        /// </summary>
-        /// <value>The database table from the merge error.</value>
-        string DatabaseTable
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the collection of database keys from the merge error.
-        /// </summary>
-        /// <value>The collection of database keys from the merge error.</value>
-        IMsmStrings DatabaseKeys
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the module table from the merge error.
-        /// </summary>
-        /// <value>The module table from the merge error.</value>
-        string ModuleTable
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the collection of module keys from the merge error.
-        /// </summary>
-        /// <value>The collection of module keys from the merge error.</value>
-        IMsmStrings ModuleKeys
-        {
-            get;
-        }
-    }
-
-    /// <summary>
-    /// A collection of strings.
-    /// </summary>
-    [ComImport, Guid("0ADDA827-2C26-11D2-AD65-00A0C9AF11A6")]
-    internal interface IMsmStrings
-    {
-        /// <summary>
-        /// Gets the string at the specified index.
-        /// </summary>
-        /// <param name="index">The one-based index of the string to get.</param>
-        string this[int index]
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Gets the count of strings in this collection.
-        /// </summary>
-        /// <value>The count of strings in this collection.</value>
-        int Count
-        {
-            get;
-        }
-    }
-
-    /// <summary>
-    /// Callback for configurable merge modules.
-    /// </summary>
-    [ComImport, Guid("AC013209-18A7-4851-8A21-2353443D70A0"), InterfaceType(ComInterfaceType.InterfaceIsIDispatch)]
-    internal interface IMsmConfigureModule
-    {
-        /// <summary>
-        /// Callback to retrieve text data for configurable merge modules.
-        /// </summary>
-        /// <param name="name">Name of the data to be retrieved.</param>
-        /// <param name="configData">The data corresponding to the name.</param>
-        /// <returns>The error code (HRESULT).</returns>
-        [PreserveSig]
-        int ProvideTextData([In, MarshalAs(UnmanagedType.BStr)] string name, [MarshalAs(UnmanagedType.BStr)] out string configData);
-
-        /// <summary>
-        /// Callback to retrieve integer data for configurable merge modules.
-        /// </summary>
-        /// <param name="name">Name of the data to be retrieved.</param>
-        /// <param name="configData">The data corresponding to the name.</param>
-        /// <returns>The error code (HRESULT).</returns>
-        [PreserveSig]
-        int ProvideIntegerData([In, MarshalAs(UnmanagedType.BStr)] string name, out int configData);
-    }
-
-    /// <summary>
-    /// Merge merge modules into an MSI file.
-    /// </summary>
-    [ComImport, Guid("F94985D5-29F9-4743-9805-99BC3F35B678")]
-    internal class MsmMerge2
-    {
-    }
-
-    /// <summary>
-    /// Defines the standard COM IClassFactory interface.
-    /// </summary>
-    [ComImport, Guid("00000001-0000-0000-C000-000000000046")]
-    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    internal interface IClassFactory
-    {
-        [return:MarshalAs(UnmanagedType.IUnknown)]
-        object CreateInstance(IntPtr unkOuter, [MarshalAs(UnmanagedType.LPStruct)] Guid iid);
-    }
-
-    /// <summary>
-    /// Contains native methods for merge operations.
-    /// </summary>
-    internal class NativeMethods
-    {
-        [DllImport("mergemod.dll", EntryPoint="DllGetClassObject", PreserveSig=false)]
-        [return: MarshalAs(UnmanagedType.IUnknown)]
-        private static extern object MergeModGetClassObject([MarshalAs(UnmanagedType.LPStruct)] Guid clsid, [MarshalAs(UnmanagedType.LPStruct)] Guid iid);
-
-        /// <summary>
-        /// Load the merge object directly from a local mergemod.dll without going through COM registration.
-        /// </summary>
-        /// <returns>Merge interface.</returns>
-        internal static IMsmMerge2 GetMsmMerge()
-        {
-            IClassFactory classFactory = (IClassFactory) MergeModGetClassObject(typeof(MsmMerge2).GUID, typeof(IClassFactory).GUID);
-            return (IMsmMerge2) classFactory.CreateInstance(IntPtr.Zero, typeof(IMsmMerge2).GUID);
-        }
-    }
-}
-#endif
\ No newline at end of file
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/Database.cs b/src/WixToolset.Core.WindowsInstaller/Msi/Database.cs
deleted file mode 100644
index 9f08a217..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Msi/Database.cs
+++ /dev/null
@@ -1,248 +0,0 @@
-// 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.Core.WindowsInstaller.Msi
-{
-    using System;
-    using System.Globalization;
-    using System.IO;
-    using System.Threading;
-
-    /// <summary>
-    /// Wrapper class for managing MSI API database handles.
-    /// </summary>
-    internal sealed class Database : MsiHandle
-    {
-        private const int STG_E_LOCKVIOLATION = unchecked((int)0x80030021);
-
-        /// <summary>
-        /// Constructor that opens an MSI database.
-        /// </summary>
-        /// <param name="path">Path to the database to be opened.</param>
-        /// <param name="type">Persist mode to use when opening the database.</param>
-        public Database(string path, OpenDatabase type)
-        {
-            int error = MsiInterop.MsiOpenDatabase(path, new IntPtr((int)type), out var handle);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-            this.Handle = handle;
-        }
-
-        public void ApplyTransform(string transformFile)
-        {
-            // get the curret validation bits
-            TransformErrorConditions conditions = TransformErrorConditions.None;
-            using (SummaryInformation summaryInfo = new SummaryInformation(transformFile))
-            {
-                string value = summaryInfo.GetProperty((int)SummaryInformation.Transform.ValidationFlags);
-                try
-                {
-                    int validationFlags = Int32.Parse(value, CultureInfo.InvariantCulture);
-                    conditions = (TransformErrorConditions)(validationFlags & 0xffff);
-                }
-                catch (FormatException)
-                {
-                    // fallback to default of None
-                }
-            }
-
-            this.ApplyTransform(transformFile, conditions);
-        }
-
-        /// <summary>
-        /// Applies a transform to this database.
-        /// </summary>
-        /// <param name="transformFile">Path to the transform file being applied.</param>
-        /// <param name="errorConditions">Specifies the error conditions that are to be suppressed.</param>
-        public void ApplyTransform(string transformFile, TransformErrorConditions errorConditions)
-        {
-            int error = MsiInterop.MsiDatabaseApplyTransform(this.Handle, transformFile, errorConditions);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-        }
-
-        /// <summary>
-        /// Commits changes made to the database.
-        /// </summary>
-        public void Commit()
-        {
-            // Retry this call 3 times to deal with an MSI internal locking problem.
-            const int retryWait = 300;
-            const int retryLimit = 3;
-            int error = 0;
-
-            for (int i = 1; i <= retryLimit; ++i)
-            {
-                error = MsiInterop.MsiDatabaseCommit(this.Handle);
-
-                if (0 == error)
-                {
-                    return;
-                }
-                else
-                {
-                    MsiException exception = new MsiException(error);
-
-                    // We need to see if the error code is contained in any of the strings in ErrorInfo.
-                    // Join the array together and search for the error code to cover the string array.
-                    if (!String.Join(", ", exception.ErrorInfo).Contains(STG_E_LOCKVIOLATION.ToString()))
-                    {
-                        break;
-                    }
-
-                    Console.Error.WriteLine(String.Format("Failed to create the database. Info: {0}. Retrying ({1} of {2})", String.Join(", ", exception.ErrorInfo), i, retryLimit));
-                    Thread.Sleep(retryWait);
-                }
-            }
-
-            throw new MsiException(error);
-        }
-
-        /// <summary>
-        /// Creates and populates the summary information stream of an existing transform file.
-        /// </summary>
-        /// <param name="referenceDatabase">Required database that does not include the changes.</param>
-        /// <param name="transformFile">The name of the generated transform file.</param>
-        /// <param name="errorConditions">Required error conditions that should be suppressed when the transform is applied.</param>
-        /// <param name="validations">Required when the transform is applied to a database;
-        /// shows which properties should be validated to verify that this transform can be applied to the database.</param>
-        public void CreateTransformSummaryInfo(Database referenceDatabase, string transformFile, TransformErrorConditions errorConditions, TransformValidations validations)
-        {
-            int error = MsiInterop.MsiCreateTransformSummaryInfo(this.Handle, referenceDatabase.Handle, transformFile, errorConditions, validations);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-        }
-
-        /// <summary>
-        /// Imports an installer text archive table (idt file) into an open database.
-        /// </summary>
-        /// <param name="idtPath">Specifies the path to the file to import.</param>
-        /// <exception cref="WixInvalidIdtException">Attempted to import an IDT file with an invalid format or unsupported data.</exception>
-        /// <exception cref="MsiException">Another error occured while importing the IDT file.</exception>
-        public void Import(string idtPath)
-        {
-            string folderPath = Path.GetFullPath(Path.GetDirectoryName(idtPath));
-            string fileName = Path.GetFileName(idtPath);
-
-            int error = MsiInterop.MsiDatabaseImport(this.Handle, folderPath, fileName);
-            if (1627 == error) // ERROR_FUNCTION_FAILED
-            {
-                throw new WixInvalidIdtException(idtPath);
-            }
-            else if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-        }
-
-        /// <summary>
-        /// Exports an installer table from an open database to a text archive file (idt file).
-        /// </summary>
-        /// <param name="tableName">Specifies the name of the table to export.</param>
-        /// <param name="folderPath">Specifies the name of the folder that contains archive files. If null or empty string, uses current directory.</param>
-        /// <param name="fileName">Specifies the name of the exported table archive file.</param>
-        public void Export(string tableName, string folderPath, string fileName)
-        {
-            if (String.IsNullOrEmpty(folderPath))
-            {
-                folderPath = Environment.CurrentDirectory;
-            }
-
-            int error = MsiInterop.MsiDatabaseExport(this.Handle, tableName, folderPath, fileName);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-        }
-
-        /// <summary>
-        /// Creates a transform that, when applied to the reference database, results in this database.
-        /// </summary>
-        /// <param name="referenceDatabase">Required database that does not include the changes.</param>
-        /// <param name="transformFile">The name of the generated transform file. This is optional.</param>
-        /// <returns>true if a transform is generated; false if a transform is not generated because
-        /// there are no differences between the two databases.</returns>
-        public bool GenerateTransform(Database referenceDatabase, string transformFile)
-        {
-            int error = MsiInterop.MsiDatabaseGenerateTransform(this.Handle, referenceDatabase.Handle, transformFile, 0, 0);
-            if (0 != error && 0xE8 != error) // ERROR_NO_DATA(0xE8) means no differences were found
-            {
-                throw new MsiException(error);
-            }
-
-            return (0xE8 != error);
-        }
-
-        /// <summary>
-        /// Merges two databases together.
-        /// </summary>
-        /// <param name="mergeDatabase">The database to merge into the base database.</param>
-        /// <param name="tableName">The name of the table to receive merge conflict information.</param>
-        public void Merge(Database mergeDatabase, string tableName)
-        {
-            int error = MsiInterop.MsiDatabaseMerge(this.Handle, mergeDatabase.Handle, tableName);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-        }
-
-        /// <summary>
-        /// Prepares a database query and creates a <see cref="View">View</see> object.
-        /// </summary>
-        /// <param name="query">Specifies a SQL query string for querying the database.</param>
-        /// <returns>A view object is returned if the query was successful.</returns>
-        public View OpenView(string query)
-        {
-            return new View(this, query);
-        }
-
-        /// <summary>
-        /// Prepares and executes a database query and creates a <see cref="View">View</see> object.
-        /// </summary>
-        /// <param name="query">Specifies a SQL query string for querying the database.</param>
-        /// <returns>A view object is returned if the query was successful.</returns>
-        public View OpenExecuteView(string query)
-        {
-            View view = new View(this, query);
-
-            view.Execute();
-            return view;
-        }
-
-        /// <summary>
-        /// Verifies the existence or absence of a table.
-        /// </summary>
-        /// <param name="tableName">Table name to to verify the existence of.</param>
-        /// <returns>Returns true if the table exists, false if it does not.</returns>
-        public bool TableExists(string tableName)
-        {
-            int result = MsiInterop.MsiDatabaseIsTablePersistent(this.Handle, tableName);
-            return MsiInterop.MSICONDITIONTRUE == result;
-        }
-
-        /// <summary>
-        /// Returns a <see cref="Record">Record</see> containing the names of all the primary 
-        /// key columns for a specified table.
-        /// </summary>
-        /// <param name="tableName">Specifies the name of the table from which to obtain 
-        /// primary key names.</param>
-        /// <returns>Returns a <see cref="Record">Record</see> containing the names of all the 
-        /// primary key columns for a specified table.</returns>
-        public Record PrimaryKeys(string tableName)
-        {
-            var error = MsiInterop.MsiDatabaseGetPrimaryKeys(this.Handle, tableName, out var recordHandle);
-            if (error != 0)
-            {
-                throw new MsiException(error);
-            }
-
-            return new Record(recordHandle);
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/Installer.cs b/src/WixToolset.Core.WindowsInstaller/Msi/Installer.cs
deleted file mode 100644
index 0edcd633..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Msi/Installer.cs
+++ /dev/null
@@ -1,363 +0,0 @@
-// 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.Core.WindowsInstaller.Msi
-{
-    using System;
-    using System.Diagnostics;
-    using System.Text;
-    using WixToolset.Core.Native;
-
-    /// <summary>
-    /// Windows Installer message types.
-    /// </summary>
-    [Flags]
-    internal enum InstallMessage
-    {
-        /// <summary>
-        /// Premature termination, possibly fatal out of memory.
-        /// </summary>
-        FatalExit = 0x00000000,
-
-        /// <summary>
-        /// Formatted error message, [1] is message number in Error table.
-        /// </summary>
-        Error = 0x01000000,
-
-        /// <summary>
-        /// Formatted warning message, [1] is message number in Error table.
-        /// </summary>
-        Warning = 0x02000000,
-
-        /// <summary>
-        /// User request message, [1] is message number in Error table.
-        /// </summary>
-        User = 0x03000000,
-
-        /// <summary>
-        /// Informative message for log, not to be displayed.
-        /// </summary>
-        Info = 0x04000000,
-
-        /// <summary>
-        /// List of files in use that need to be replaced.
-        /// </summary>
-        FilesInUse = 0x05000000,
-
-        /// <summary>
-        /// Request to determine a valid source location.
-        /// </summary>
-        ResolveSource = 0x06000000,
-
-        /// <summary>
-        /// Insufficient disk space message.
-        /// </summary>
-        OutOfDiskSpace = 0x07000000,
-
-        /// <summary>
-        /// Progress: start of action, [1] action name, [2] description, [3] template for ACTIONDATA messages.
-        /// </summary>
-        ActionStart = 0x08000000,
-
-        /// <summary>
-        /// Action data. Record fields correspond to the template of ACTIONSTART message.
-        /// </summary>
-        ActionData = 0x09000000,
-
-        /// <summary>
-        /// Progress bar information. See the description of record fields below.
-        /// </summary>
-        Progress = 0x0A000000,
-
-        /// <summary>
-        /// To enable the Cancel button set [1] to 2 and [2] to 1. To disable the Cancel button set [1] to 2 and [2] to 0.
-        /// </summary>
-        CommonData = 0x0B000000,
-
-        /// <summary>
-        /// Sent prior to UI initialization, no string data.
-        /// </summary>
-        Initilize = 0x0C000000,
-
-        /// <summary>
-        /// Sent after UI termination, no string data.
-        /// </summary>
-        Terminate = 0x0D000000,
-
-        /// <summary>
-        /// Sent prior to display or authored dialog or wizard.
-        /// </summary>
-        ShowDialog = 0x0E000000
-    }
-
-    /// <summary>
-    /// Windows Installer log modes.
-    /// </summary>
-    [Flags]
-    internal enum InstallLogModes
-    {
-        /// <summary>
-        /// Premature termination of installation.
-        /// </summary>
-        FatalExit = (1 << ((int)InstallMessage.FatalExit >> 24)),
-
-        /// <summary>
-        /// The error messages are logged.
-        /// </summary>
-        Error = (1 << ((int)InstallMessage.Error >> 24)),
-
-        /// <summary>
-        /// The warning messages are logged.
-        /// </summary>
-        Warning = (1 << ((int)InstallMessage.Warning >> 24)),
-
-        /// <summary>
-        /// The user requests are logged.
-        /// </summary>
-        User = (1 << ((int)InstallMessage.User >> 24)),
-
-        /// <summary>
-        /// The status messages that are not displayed are logged.
-        /// </summary>
-        Info = (1 << ((int)InstallMessage.Info >> 24)),
-
-        /// <summary>
-        /// Request to determine a valid source location.
-        /// </summary>
-        ResolveSource = (1 << ((int)InstallMessage.ResolveSource >> 24)),
-
-        /// <summary>
-        /// The was insufficient disk space.
-        /// </summary>
-        OutOfDiskSpace = (1 << ((int)InstallMessage.OutOfDiskSpace >> 24)),
-
-        /// <summary>
-        /// The start of new installation actions are logged.
-        /// </summary>
-        ActionStart = (1 << ((int)InstallMessage.ActionStart >> 24)),
-
-        /// <summary>
-        /// The data record with the installation action is logged.
-        /// </summary>
-        ActionData = (1 << ((int)InstallMessage.ActionData >> 24)),
-
-        /// <summary>
-        /// The parameters for user-interface initialization are logged.
-        /// </summary>
-        CommonData = (1 << ((int)InstallMessage.CommonData >> 24)),
-
-        /// <summary>
-        /// Logs the property values at termination.
-        /// </summary>
-        PropertyDump = (1 << ((int)InstallMessage.Progress >> 24)),
-
-        /// <summary>
-        /// Sends large amounts of information to a log file not generally useful to users.
-        /// May be used for technical support.
-        /// </summary>
-        Verbose = (1 << ((int)InstallMessage.Initilize >> 24)),
-
-        /// <summary>
-        /// Sends extra debugging information, such as handle creation information, to the log file.
-        /// </summary>
-        ExtraDebug = (1 << ((int)InstallMessage.Terminate >> 24)),
-
-        /// <summary>
-        /// Progress bar information. This message includes information on units so far and total number of units.
-        /// See MsiProcessMessage for an explanation of the message format.
-        /// This message is only sent to an external user interface and is not logged.
-        /// </summary>
-        Progress = (1 << ((int)InstallMessage.Progress >> 24)),
-
-        /// <summary>
-        /// If this is not a quiet installation, then the basic UI has been initialized.
-        /// If this is a full UI installation, the full UI is not yet initialized.
-        /// This message is only sent to an external user interface and is not logged.
-        /// </summary>
-        Initialize = (1 << ((int)InstallMessage.Initilize >> 24)),
-
-        /// <summary>
-        /// If a full UI is being used, the full UI has ended.
-        /// If this is not a quiet installation, the basic UI has not yet ended.
-        /// This message is only sent to an external user interface and is not logged.
-        /// </summary>
-        Terminate = (1 << ((int)InstallMessage.Terminate >> 24)),
-
-        /// <summary>
-        /// Sent prior to display of the full UI dialog.
-        /// This message is only sent to an external user interface and is not logged.
-        /// </summary>
-        ShowDialog = (1 << ((int)InstallMessage.ShowDialog >> 24)),
-
-        /// <summary>
-        /// Files in use information. When this message is received, a FilesInUse Dialog should be displayed.
-        /// </summary>
-        FilesInUse = (1 << ((int)InstallMessage.FilesInUse >> 24))
-    }
-
-    /// <summary>
-    /// Windows Installer UI levels.
-    /// </summary>
-    [Flags]
-    internal enum InstallUILevels
-    {
-        /// <summary>
-        /// No change in the UI level. However, if phWnd is not Null, the parent window can change.
-        /// </summary>
-        NoChange = 0,
-
-        /// <summary>
-        /// The installer chooses an appropriate user interface level.
-        /// </summary>
-        Default = 1,
-
-        /// <summary>
-        /// Completely silent installation.
-        /// </summary>
-        None = 2,
-
-        /// <summary>
-        /// Simple progress and error handling.
-        /// </summary>
-        Basic = 3,
-
-        /// <summary>
-        /// Authored user interface with wizard dialog boxes suppressed.
-        /// </summary>
-        Reduced = 4,
-
-        /// <summary>
-        /// Authored user interface with wizards, progress, and errors.
-        /// </summary>
-        Full = 5,
-
-        /// <summary>
-        /// If combined with the Basic value, the installer shows simple progress dialog boxes but
-        /// does not display a Cancel button on the dialog. This prevents users from canceling the install.
-        /// Available with Windows Installer version 2.0.
-        /// </summary>
-        HideCancel = 0x20,
-
-        /// <summary>
-        /// If combined with the Basic value, the installer shows simple progress
-        /// dialog boxes but does not display any modal dialog boxes or error dialog boxes.
-        /// </summary>
-        ProgressOnly = 0x40,
-
-        /// <summary>
-        /// If combined with any above value, the installer displays a modal dialog
-        /// box at the end of a successful installation or if there has been an error.
-        /// No dialog box is displayed if the user cancels.
-        /// </summary>
-        EndDialog = 0x80,
-
-        /// <summary>
-        /// If this value is combined with the None value, the installer displays only the dialog
-        /// boxes used for source resolution. No other dialog boxes are shown. This value has no
-        /// effect if the UI level is not INSTALLUILEVEL_NONE. It is used with an external user
-        /// interface designed to handle all of the UI except for source resolution. In this case,
-        /// the installer handles source resolution. This value is only available with Windows Installer 2.0 and later.
-        /// </summary>
-        SourceResOnly = 0x100
-    }
-
-    /// <summary>
-    /// Represents the Windows Installer, provides wrappers to
-    /// create the top-level objects and access their methods.
-    /// </summary>
-    internal sealed class Installer
-    {
-        /// <summary>
-        /// Protect the constructor.
-        /// </summary>
-        private Installer()
-        {
-        }
-
-        /// <summary>
-        /// Takes the path to a file and returns a 128-bit hash of that file.
-        /// </summary>
-        /// <param name="filePath">Path to file that is to be hashed.</param>
-        /// <param name="options">The value in this column must be 0. This parameter is reserved for future use.</param>
-        /// <param name="hash">Int array that receives the returned file hash information.</param>
-        internal static void GetFileHash(string filePath, int options, out int[] hash)
-        {
-            MSIFILEHASHINFO hashInterop = new MSIFILEHASHINFO();
-            hashInterop.FileHashInfoSize = 20;
-
-            int error = MsiInterop.MsiGetFileHash(filePath, Convert.ToUInt32(options), hashInterop);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-
-            Debug.Assert(20 == hashInterop.FileHashInfoSize);
-
-            hash = new int[4];
-            hash[0] = hashInterop.Data0;
-            hash[1] = hashInterop.Data1;
-            hash[2] = hashInterop.Data2;
-            hash[3] = hashInterop.Data3;
-        }
-
-        /// <summary>
-        /// Returns the version string and language string in the format that the installer 
-        /// expects to find them in the database.  If you just want version information, set 
-        /// lpLangBuf and pcchLangBuf to zero. If you just want language information, set 
-        /// lpVersionBuf and pcchVersionBuf to zero.
-        /// </summary>
-        /// <param name="filePath">Specifies the path to the file.</param>
-        /// <param name="version">Returns the file version. Set to 0 for language information only.</param>
-        /// <param name="language">Returns the file language. Set to 0 for version information only.</param>
-        internal static void GetFileVersion(string filePath, out string version, out string language)
-        {
-            int versionLength = 20;
-            int languageLength = 20;
-            StringBuilder versionBuffer = new StringBuilder(versionLength);
-            StringBuilder languageBuffer = new StringBuilder(languageLength);
-
-            int error = MsiInterop.MsiGetFileVersion(filePath, versionBuffer, ref versionLength, languageBuffer, ref languageLength);
-            if (234 == error)
-            {
-                versionBuffer.EnsureCapacity(++versionLength);
-                languageBuffer.EnsureCapacity(++languageLength);
-                error = MsiInterop.MsiGetFileVersion(filePath, versionBuffer, ref versionLength, languageBuffer, ref languageLength);
-            }
-            else if (1006 == error)
-            {
-                // file has no version or language, so no error
-                error = 0;
-            }
-
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-
-            version = versionBuffer.ToString();
-            language = languageBuffer.ToString();
-        }
-
-        /// <summary>
-        /// Enables an external user-interface handler.
-        /// </summary>
-        /// <param name="installUIHandler">Specifies a callback function.</param>
-        /// <param name="messageFilter">Specifies which messages to handle using the external message handler.</param>
-        /// <param name="context">Pointer to an application context that is passed to the callback function.</param>
-        /// <returns>The return value is the previously set external handler, or null if there was no previously set handler.</returns>
-        internal static InstallUIHandler SetExternalUI(InstallUIHandler installUIHandler, int messageFilter, IntPtr context)
-        {
-            return MsiInterop.MsiSetExternalUI(installUIHandler, messageFilter, context);
-        }
-
-        /// <summary>
-        /// Enables the installer's internal user interface.
-        /// </summary>
-        /// <param name="uiLevel">Specifies the level of complexity of the user interface.</param>
-        /// <param name="hwnd">Pointer to a window. This window becomes the owner of any user interface created.</param>
-        /// <returns>The previous user interface level is returned. If an invalid dwUILevel is passed, then INSTALLUILEVEL_NOCHANGE is returned.</returns>
-        internal static int SetInternalUI(int uiLevel, ref IntPtr hwnd)
-        {
-            return MsiInterop.MsiSetInternalUI(uiLevel, ref hwnd);
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/MsiException.cs b/src/WixToolset.Core.WindowsInstaller/Msi/MsiException.cs
deleted file mode 100644
index 4e324a60..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Msi/MsiException.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-// 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.Core.WindowsInstaller.Msi
-{
-    using System;
-    using System.ComponentModel;
-
-    /// <summary>
-    /// Exception that wraps MsiGetLastError().
-    /// </summary>
-    [Serializable]
-    public class MsiException : Win32Exception
-    {
-        /// <summary>
-        /// Instantiate a new MsiException with a given error.
-        /// </summary>
-        /// <param name="error">The error code from the MsiXxx() function call.</param>
-        public MsiException(int error) : base(error)
-        {
-            uint handle = MsiInterop.MsiGetLastErrorRecord();
-            if (0 != handle)
-            {
-                using (Record record = new Record(handle))
-                {
-                    this.MsiError = record.GetInteger(1);
-
-                    int errorInfoCount = record.GetFieldCount() - 1;
-                    this.ErrorInfo = new string[errorInfoCount];
-                    for (int i = 0; i < errorInfoCount; ++i)
-                    {
-                        this.ErrorInfo[i] = record.GetString(i + 2);
-                    }
-                }
-            }
-            else
-            {
-                this.MsiError = 0;
-                this.ErrorInfo = new string[0];
-            }
-
-            this.Error = error;
-        }
-
-        /// <summary>
-        /// Gets the error number.
-        /// </summary>
-        public int Error { get; private set; }
-
-        /// <summary>
-        /// Gets the internal MSI error number.
-        /// </summary>
-        public int MsiError { get; private set; }
-
-        /// <summary>
-        /// Gets any additional the error information.
-        /// </summary>
-        public string[] ErrorInfo { get; private set; }
-
-        /// <summary>
-        /// Overrides Message property to return useful error message.
-        /// </summary>
-        public override string Message
-        {
-            get
-            {
-                if (0 == this.MsiError)
-                {
-                    return base.Message;
-                }
-                else
-                {
-                    return String.Format("Internal MSI failure. Win32 error: {0}, MSI error: {1}, detail: {2}", this.Error, this.MsiError, String.Join(", ", this.ErrorInfo));
-                }
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/MsiHandle.cs b/src/WixToolset.Core.WindowsInstaller/Msi/MsiHandle.cs
deleted file mode 100644
index 9006180b..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Msi/MsiHandle.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// 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.Core.WindowsInstaller.Msi
-{
-    using System;
-    using System.ComponentModel;
-#if !DEBUG
-    using System.Diagnostics;
-#endif
-    using System.Threading;
-
-    /// <summary>
-    /// Wrapper class for MSI handle.
-    /// </summary>
-    public class MsiHandle : IDisposable
-    {
-        private bool disposed;
-        private uint handle;
-        private int owningThread;
-#if DEBUG
-        private string creationStack;
-#endif
-
-        /// <summary>
-        /// MSI handle destructor.
-        /// </summary>
-        ~MsiHandle()
-        {
-            this.Dispose(false);
-        }
-
-        /// <summary>
-        /// Gets or sets the MSI handle.
-        /// </summary>
-        /// <value>The MSI handle.</value>
-        internal uint Handle
-        {
-            get
-            {
-                if (this.disposed)
-                {
-                    throw new ObjectDisposedException("MsiHandle");
-                }
-
-                return this.handle;
-            }
-
-            set
-            {
-                if (this.disposed)
-                {
-                    throw new ObjectDisposedException("MsiHandle");
-                }
-
-                this.handle = value;
-                this.owningThread = Thread.CurrentThread.ManagedThreadId;
-#if DEBUG
-                this.creationStack = Environment.StackTrace;
-#endif
-            }
-        }
-
-        /// <summary>
-        /// Close the MSI handle.
-        /// </summary>
-        public void Close()
-        {
-            this.Dispose();
-        }
-
-        /// <summary>
-        /// Disposes the managed and unmanaged objects in this object.
-        /// </summary>
-        public void Dispose()
-        {
-            this.Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Disposes the managed and unmanaged objects in this object.
-        /// </summary>
-        /// <param name="disposing">true to dispose the managed objects.</param>
-        protected virtual void Dispose(bool disposing)
-        {
-            if (!this.disposed)
-            {
-                if (0 != this.handle)
-                {
-                    if (Thread.CurrentThread.ManagedThreadId == this.owningThread)
-                    {
-                        int error = MsiInterop.MsiCloseHandle(this.handle);
-                        if (0 != error)
-                        {
-                            throw new Win32Exception(error);
-                        }
-                        this.handle = 0;
-                    }
-                    else
-                    {
-                        // Don't try to close the handle on a different thread than it was opened.
-                        // This will occasionally cause MSI to AV.
-                        string message = String.Format("Leaked msi handle {0} created on thread {1} by type {2}.  This handle cannot be closed on thread {3}",
-                            this.handle, this.owningThread, this.GetType(), Thread.CurrentThread.ManagedThreadId);
-#if DEBUG
-                        throw new InvalidOperationException(String.Format("{0}.  Created {1}", message, this.creationStack));
-#else
-                        Debug.WriteLine(message);
-#endif
-                    }
-                }
-
-                this.disposed = true;
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/MsiInterop.cs b/src/WixToolset.Core.WindowsInstaller/Msi/MsiInterop.cs
deleted file mode 100644
index ae585612..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Msi/MsiInterop.cs
+++ /dev/null
@@ -1,571 +0,0 @@
-// 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.Core.WindowsInstaller.Msi
-{
-    using System;
-    using System.Text;
-    using System.Runtime.InteropServices;
-    using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
-    using WixToolset.Core.Native;
-
-    /// <summary>
-    /// A callback function that the installer calls for progress notification and error messages.
-    /// </summary>
-    /// <param name="context">Pointer to an application context.
-    /// This parameter can be used for error checking.</param>
-    /// <param name="messageType">Specifies a combination of one message box style,
-    /// one message box icon type, one default button, and one installation message type.</param>
-    /// <param name="message">Specifies the message text.</param>
-    /// <returns>-1 for an error, 0 if no action was taken, 1 if OK, 3 to abort.</returns>
-    public delegate int InstallUIHandler(IntPtr context, uint messageType, [MarshalAs(UnmanagedType.LPWStr)] string message);
-
-    /// <summary>
-    /// Enum of predefined persist modes used when opening a database.
-    /// </summary>
-    public enum OpenDatabase
-    {
-        /// <summary>
-        /// Open a database read-only, no persistent changes.
-        /// </summary>
-        ReadOnly = 0,
-
-        /// <summary>
-        /// Open a database read/write in transaction mode.
-        /// </summary>
-        Transact = 1,
-
-        /// <summary>
-        /// Open a database direct read/write without transaction.
-        /// </summary>
-        Direct = 2,
-
-        /// <summary>
-        /// Create a new database, transact mode read/write.
-        /// </summary>
-        Create = 3,
-
-        /// <summary>
-        /// Create a new database, direct mode read/write.
-        /// </summary>
-        CreateDirect = 4,
-
-        /// <summary>
-        /// Indicates a patch file is being opened.
-        /// </summary>
-        OpenPatchFile = 32
-    }
-
-    /// <summary>
-    /// The errors to suppress when applying a transform.
-    /// </summary>
-    [Flags]
-    public enum TransformErrorConditions
-    {
-        /// <summary>
-        /// None of the following conditions.
-        /// </summary>
-        None = 0x0,
-
-        /// <summary>
-        /// Suppress error when adding a row that exists.
-        /// </summary>
-        AddExistingRow = 0x1,
-
-        /// <summary>
-        /// Suppress error when deleting a row that does not exist.
-        /// </summary>
-        DeleteMissingRow = 0x2,
-
-        /// <summary>
-        /// Suppress error when adding a table that exists.
-        /// </summary>
-        AddExistingTable = 0x4,
-
-        /// <summary>
-        /// Suppress error when deleting a table that does not exist.
-        /// </summary>
-        DeleteMissingTable = 0x8,
-
-        /// <summary>
-        /// Suppress error when updating a row that does not exist.
-        /// </summary>
-        UpdateMissingRow = 0x10,
-
-        /// <summary>
-        /// Suppress error when transform and database code pages do not match, and their code pages are neutral.
-        /// </summary>
-        ChangeCodepage = 0x20,
-
-        /// <summary>
-        /// Create the temporary _TransformView table when applying a transform.
-        /// </summary>
-        ViewTransform = 0x100,
-
-        /// <summary>
-        /// Suppress all errors but the option to create the temporary _TransformView table.
-        /// </summary>
-        All = 0x3F
-    }
-
-    /// <summary>
-    /// The validation to run while applying a transform.
-    /// </summary>
-    [Flags]
-    public enum TransformValidations
-    {
-        /// <summary>
-        /// Do not validate properties.
-        /// </summary>
-        None = 0x0,
-
-        /// <summary>
-        /// Default language must match base database.
-        /// </summary>
-        Language = 0x1,
-
-        /// <summary>
-        /// Product must match base database.
-        /// </summary>
-        Product = 0x2,
-
-        /// <summary>
-        /// Check major version only.
-        /// </summary>
-        MajorVersion = 0x8,
-
-        /// <summary>
-        /// Check major and minor versions only.
-        /// </summary>
-        MinorVersion = 0x10,
-
-        /// <summary>
-        /// Check major, minor, and update versions.
-        /// </summary>
-        UpdateVersion = 0x20,
-
-        /// <summary>
-        /// Installed version &lt; base version.
-        /// </summary>
-        NewLessBaseVersion = 0x40,
-
-        /// <summary>
-        /// Installed version &lt;= base version.
-        /// </summary>
-        NewLessEqualBaseVersion = 0x80,
-
-        /// <summary>
-        /// Installed version = base version.
-        /// </summary>
-        NewEqualBaseVersion = 0x100,
-
-        /// <summary>
-        /// Installed version &gt;= base version.
-        /// </summary>
-        NewGreaterEqualBaseVersion = 0x200,
-
-        /// <summary>
-        /// Installed version &gt; base version.
-        /// </summary>
-        NewGreaterBaseVersion = 0x400,
-
-        /// <summary>
-        /// UpgradeCode must match base database.
-        /// </summary>
-        UpgradeCode = 0x800
-    }
-
-    /// <summary>
-    /// Class exposing static functions and structs from MSI API.
-    /// </summary>
-    internal sealed class MsiInterop
-    {
-        // Patching constants
-        public const int MsiMaxStreamNameLength = 62; // http://msdn2.microsoft.com/library/aa370551.aspx
-
-        public const int MSICONDITIONFALSE = 0;   // The table is temporary.
-        public const int MSICONDITIONTRUE = 1;   // The table is persistent.
-        public const int MSICONDITIONNONE = 2;   // The table is unknown.
-        public const int MSICONDITIONERROR = 3;   // An invalid handle or invalid parameter was passed to the function.
-        /*
-        public const int MSIDBOPENREADONLY = 0;
-        public const int MSIDBOPENTRANSACT = 1;
-        public const int MSIDBOPENDIRECT = 2;
-        public const int MSIDBOPENCREATE = 3;
-        public const int MSIDBOPENCREATEDIRECT = 4;
-        public const int MSIDBOPENPATCHFILE = 32;
-
-        public const int MSIMODIFYSEEK = -1;   // Refreshes the information in the supplied record without changing the position in the result set and without affecting subsequent fetch operations. The record may then be used for subsequent Update, Delete, and Refresh. All primary key columns of the table must be in the query and the record must have at least as many fields as the query. Seek cannot be used with multi-table queries. This mode cannot be used with a view containing joins. See also the remarks.
-        public const int MSIMODIFYREFRESH = 0;   // Refreshes the information in the record. Must first call MsiViewFetch with the same record. Fails for a deleted row. Works with read-write and read-only records.
-        public const int MSIMODIFYINSERT = 1;   // Inserts a record. Fails if a row with the same primary keys exists. Fails with a read-only database. This mode cannot be used with a view containing joins.
-        public const int MSIMODIFYUPDATE = 2;   // Updates an existing record. Nonprimary keys only. Must first call MsiViewFetch. Fails with a deleted record. Works only with read-write records.
-        public const int MSIMODIFYASSIGN = 3;   // Writes current data in the cursor to a table row. Updates record if the primary keys match an existing row and inserts if they do not match. Fails with a read-only database. This mode cannot be used with a view containing joins.
-        public const int MSIMODIFYREPLACE = 4;   // Updates or deletes and inserts a record into a table. Must first call MsiViewFetch with the same record. Updates record if the primary keys are unchanged. Deletes old row and inserts new if primary keys have changed. Fails with a read-only database. This mode cannot be used with a view containing joins.
-        public const int MSIMODIFYMERGE = 5;   // Inserts or validates a record in a table. Inserts if primary keys do not match any row and validates if there is a match. Fails if the record does not match the data in the table. Fails if there is a record with a duplicate key that is not identical. Works only with read-write records. This mode cannot be used with a view containing joins.
-        public const int MSIMODIFYDELETE = 6;   // Remove a row from the table. You must first call the MsiViewFetch function with the same record. Fails if the row has been deleted. Works only with read-write records. This mode cannot be used with a view containing joins.
-        public const int MSIMODIFYINSERTTEMPORARY = 7;   // Inserts a temporary record. The information is not persistent. Fails if a row with the same primary key exists. Works only with read-write records. This mode cannot be used with a view containing joins.
-        public const int MSIMODIFYVALIDATE = 8;   // Validates a record. Does not validate across joins. You must first call the MsiViewFetch function with the same record. Obtain validation errors with MsiViewGetError. Works with read-write and read-only records. This mode cannot be used with a view containing joins.
-        public const int MSIMODIFYVALIDATENEW = 9;   // Validate a new record. Does not validate across joins. Checks for duplicate keys. Obtain validation errors by calling MsiViewGetError. Works with read-write and read-only records. This mode cannot be used with a view containing joins.
-        public const int MSIMODIFYVALIDATEFIELD = 10;   // Validates fields of a fetched or new record. Can validate one or more fields of an incomplete record. Obtain validation errors by calling MsiViewGetError. Works with read-write and read-only records. This mode cannot be used with a view containing joins.
-        public const int MSIMODIFYVALIDATEDELETE = 11;   // Validates a record that will be deleted later. You must first call MsiViewFetch. Fails if another row refers to the primary keys of this row. Validation does not check for the existence of the primary keys of this row in properties or strings. Does not check if a column is a foreign key to multiple tables. Obtain validation errors by calling MsiViewGetError. Works with read-write and read-only records. This mode cannot be used with a view containing joins.
-
-        public const uint VTI2 = 2;
-        public const uint VTI4 = 3;
-        public const uint VTLPWSTR = 30;
-        public const uint VTFILETIME = 64;
-        */
-
-        public const int MSICOLINFONAMES = 0;  // return column names
-        public const int MSICOLINFOTYPES = 1;  // return column definitions, datatype code followed by width
-
-        /// <summary>
-        /// Protect the constructor.
-        /// </summary>
-        private MsiInterop()
-        {
-        }
-
-        /// <summary>
-        /// PInvoke of MsiCloseHandle.
-        /// </summary>
-        /// <param name="database">Handle to a database.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiCloseHandle", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiCloseHandle(uint database);
-
-        /// <summary>
-        /// PInvoke of MsiCreateRecord
-        /// </summary>
-        /// <param name="parameters">Count of columns in the record.</param>
-        /// <returns>Handle referencing the record.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiCreateRecord", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern uint MsiCreateRecord(int parameters);
-
-        /// <summary>
-        /// Creates summary information of an existing transform to include validation and error conditions.
-        /// </summary>
-        /// <param name="database">The handle to the database that contains the new database summary information.</param>
-        /// <param name="referenceDatabase">The handle to the database that contains the original summary information.</param>
-        /// <param name="transformFile">The name of the transform to which the summary information is added.</param>
-        /// <param name="errorConditions">The error conditions that should be suppressed when the transform is applied.</param>
-        /// <param name="validations">Specifies the properties to be validated to verify that the transform can be applied to the database.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiCreateTransformSummaryInfoW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiCreateTransformSummaryInfo(uint database, uint referenceDatabase, string transformFile, TransformErrorConditions errorConditions, TransformValidations validations);
-
-        /// <summary>
-        /// Applies a transform to a database.
-        /// </summary>
-        /// <param name="database">Handle to the database obtained from MsiOpenDatabase to transform.</param>
-        /// <param name="transformFile">Specifies the name of the transform file to apply.</param>
-        /// <param name="errorConditions">Error conditions that should be suppressed.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiDatabaseApplyTransformW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiDatabaseApplyTransform(uint database, string transformFile, TransformErrorConditions errorConditions);
-
-        /// <summary>
-        /// PInvoke of MsiDatabaseCommit.
-        /// </summary>
-        /// <param name="database">Handle to a databse.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiDatabaseCommit", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiDatabaseCommit(uint database);
-
-        /// <summary>
-        /// PInvoke of MsiDatabaseExportW.
-        /// </summary>
-        /// <param name="database">Handle to a database.</param>
-        /// <param name="tableName">Table name.</param>
-        /// <param name="folderPath">Folder path.</param>
-        /// <param name="fileName">File name.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiDatabaseExportW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiDatabaseExport(uint database, string tableName, string folderPath, string fileName);
-
-        /// <summary>
-        /// Generates a transform file of differences between two databases.
-        /// </summary>
-        /// <param name="database">Handle to the database obtained from MsiOpenDatabase that includes the changes.</param>
-        /// <param name="databaseReference">Handle to the database obtained from MsiOpenDatabase that does not include the changes.</param>
-        /// <param name="transformFile">A null-terminated string that specifies the name of the transform file being generated.
-        /// This parameter can be null. If szTransformFile is null, you can use MsiDatabaseGenerateTransform to test whether two
-        /// databases are identical without creating a transform. If the databases are identical, the function returns ERROR_NO_DATA.
-        /// If the databases are different the function returns NOERROR.</param>
-        /// <param name="reserved1">This is a reserved argument and must be set to 0.</param>
-        /// <param name="reserved2">This is a reserved argument and must be set to 0.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiDatabaseGenerateTransformW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiDatabaseGenerateTransform(uint database, uint databaseReference, string transformFile, int reserved1, int reserved2);
-
-        /// <summary>
-        /// PInvoke of MsiDatabaseImportW.
-        /// </summary>
-        /// <param name="database">Handle to a database.</param>
-        /// <param name="folderPath">Folder path.</param>
-        /// <param name="fileName">File name.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiDatabaseImportW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiDatabaseImport(uint database, string folderPath, string fileName);
-
-        /// <summary>
-        /// PInvoke of MsiDatabaseMergeW.
-        /// </summary>
-        /// <param name="database">The handle to the database obtained from MsiOpenDatabase.</param>
-        /// <param name="databaseMerge">The handle to the database obtained from MsiOpenDatabase to merge into the base database.</param>
-        /// <param name="tableName">The name of the table to receive merge conflict information.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiDatabaseMergeW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiDatabaseMerge(uint database, uint databaseMerge, string tableName);
-
-        /// <summary>
-        /// PInvoke of MsiDatabaseOpenViewW.
-        /// </summary>
-        /// <param name="database">Handle to a database.</param>
-        /// <param name="query">SQL query.</param>
-        /// <param name="view">View handle.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiDatabaseOpenViewW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiDatabaseOpenView(uint database, string query, out uint view);
-
-        /// <summary>
-        /// PInvoke of MsiGetFileHashW.
-        /// </summary>
-        /// <param name="filePath">File path.</param>
-        /// <param name="options">Hash options (must be 0).</param>
-        /// <param name="hash">Buffer to recieve hash.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiGetFileHashW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiGetFileHash(string filePath, uint options, MSIFILEHASHINFO hash);
-
-        /// <summary>
-        /// PInvoke of MsiGetFileVersionW.
-        /// </summary>
-        /// <param name="filePath">File path.</param>
-        /// <param name="versionBuf">Buffer to receive version info.</param>
-        /// <param name="versionBufSize">Size of version buffer.</param>
-        /// <param name="langBuf">Buffer to recieve lang info.</param>
-        /// <param name="langBufSize">Size of lang buffer.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiGetFileVersionW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiGetFileVersion(string filePath, StringBuilder versionBuf, ref int versionBufSize, StringBuilder langBuf, ref int langBufSize);
-
-        /// <summary>
-        /// PInvoke of MsiGetLastErrorRecord.
-        /// </summary>
-        /// <returns>Handle to error record if one exists.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiGetLastErrorRecord", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern uint MsiGetLastErrorRecord();
-
-        /// <summary>
-        /// PInvoke of MsiDatabaseGetPrimaryKeysW.
-        /// </summary>
-        /// <param name="database">Handle to a database.</param>
-        /// <param name="tableName">Table name.</param>
-        /// <param name="record">Handle to receive resulting record.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiDatabaseGetPrimaryKeysW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiDatabaseGetPrimaryKeys(uint database, string tableName, out uint record);
-
-        /// <summary>
-        /// PInvoke of MsiDoActionW.
-        /// </summary>
-        /// <param name="product">Handle to the installation provided to a DLL custom action or
-        /// obtained through MsiOpenPackage, MsiOpenPackageEx, or MsiOpenProduct.</param>
-        /// <param name="action">Specifies the action to execute.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiDoActionW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiDoAction(uint product, string action);
-
-        /// <summary>
-        /// PInvoke of MsiGetSummaryInformationW.  Can use either database handle or database path as input.
-        /// </summary>
-        /// <param name="database">Handle to a database.</param>
-        /// <param name="databasePath">Path to a database.</param>
-        /// <param name="updateCount">Max number of updated values.</param>
-        /// <param name="summaryInfo">Handle to summary information.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiGetSummaryInformationW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiGetSummaryInformation(uint database, string databasePath, uint updateCount, ref uint summaryInfo);
-
-        /// <summary>
-        /// PInvoke of MsiDatabaseIsTablePersitentW.
-        /// </summary>
-        /// <param name="database">Handle to a database.</param>
-        /// <param name="tableName">Table name.</param>
-        /// <returns>MSICONDITION</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiDatabaseIsTablePersistentW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiDatabaseIsTablePersistent(uint database, string tableName);
-
-        /// <summary>
-        /// PInvoke of MsiOpenDatabaseW.
-        /// </summary>
-        /// <param name="databasePath">Path to database.</param>
-        /// <param name="persist">Persist mode.</param>
-        /// <param name="database">Handle to database.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiOpenDatabaseW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiOpenDatabase(string databasePath, IntPtr persist, out uint database);
-
-        /// <summary>
-        /// PInvoke of MsiOpenPackageW.
-        /// </summary>
-        /// <param name="packagePath">The path to the package.</param>
-        /// <param name="product">A pointer to a variable that receives the product handle.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiOpenPackageW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiOpenPackage(string packagePath, out uint product);
-
-        /// <summary>
-        /// PInvoke of MsiRecordIsNull.
-        /// </summary>
-        /// <param name="record">MSI Record handle.</param>
-        /// <param name="field">Index of field to check for null value.</param>
-        /// <returns>true if the field is null, false if not, and an error code for any error.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiRecordIsNull", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiRecordIsNull(uint record, int field);
-
-        /// <summary>
-        /// PInvoke of MsiRecordGetInteger.
-        /// </summary>
-        /// <param name="record">MSI Record handle.</param>
-        /// <param name="field">Index of field to retrieve integer from.</param>
-        /// <returns>Integer value.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiRecordGetInteger", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiRecordGetInteger(uint record, int field);
-
-        /// <summary>
-        /// PInvoke of MsiRectordSetInteger.
-        /// </summary>
-        /// <param name="record">MSI Record handle.</param>
-        /// <param name="field">Index of field to set integer value in.</param>
-        /// <param name="value">Value to set field to.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiRecordSetInteger", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiRecordSetInteger(uint record, int field, int value);
-
-        /// <summary>
-        /// PInvoke of MsiRecordGetStringW.
-        /// </summary>
-        /// <param name="record">MSI Record handle.</param>
-        /// <param name="field">Index of field to get string value from.</param>
-        /// <param name="valueBuf">Buffer to recieve value.</param>
-        /// <param name="valueBufSize">Size of buffer.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiRecordGetStringW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiRecordGetString(uint record, int field, StringBuilder valueBuf, ref int valueBufSize);
-
-        /// <summary>
-        /// PInvoke of MsiRecordSetStringW.
-        /// </summary>
-        /// <param name="record">MSI Record handle.</param>
-        /// <param name="field">Index of field to set string value in.</param>
-        /// <param name="value">String value.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiRecordSetStringW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiRecordSetString(uint record, int field, string value);
-
-        /// <summary>
-        /// PInvoke of MsiRecordSetStreamW.
-        /// </summary>
-        /// <param name="record">MSI Record handle.</param>
-        /// <param name="field">Index of field to set stream value in.</param>
-        /// <param name="filePath">Path to file to set stream value to.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiRecordSetStreamW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiRecordSetStream(uint record, int field, string filePath);
-
-        /// <summary>
-        /// PInvoke of MsiRecordReadStreamW.
-        /// </summary>
-        /// <param name="record">MSI Record handle.</param>
-        /// <param name="field">Index of field to read stream from.</param>
-        /// <param name="dataBuf">Data buffer to recieve stream value.</param>
-        /// <param name="dataBufSize">Size of data buffer.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiRecordReadStream", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiRecordReadStream(uint record, int field, byte[] dataBuf, ref int dataBufSize);
-
-        /// <summary>
-        /// PInvoke of MsiRecordGetFieldCount.
-        /// </summary>
-        /// <param name="record">MSI Record handle.</param>
-        /// <returns>Count of fields in the record.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiRecordGetFieldCount", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiRecordGetFieldCount(uint record);
-
-        /// <summary>
-        /// PInvoke of MsiSetExternalUIW.
-        /// </summary>
-        /// <param name="installUIHandler">Specifies a callback function that conforms to the INSTALLUI_HANDLER specification.</param>
-        /// <param name="installLogMode">Specifies which messages to handle using the external message handler. If the external
-        /// handler returns a non-zero result, then that message will not be sent to the UI, instead the message will be logged
-        /// if logging has been enabled.</param>
-        /// <param name="context">Pointer to an application context that is passed to the callback function.
-        /// This parameter can be used for error checking.</param>
-        /// <returns>The return value is the previously set external handler, or zero (0) if there was no previously set handler.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiSetExternalUIW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern InstallUIHandler MsiSetExternalUI(InstallUIHandler installUIHandler, int installLogMode, IntPtr context);
-
-        /// <summary>
-        /// PInvoke of MsiSetpublicUI.
-        /// </summary>
-        /// <param name="uiLevel">Specifies the level of complexity of the user interface.</param>
-        /// <param name="hwnd">Pointer to a window. This window becomes the owner of any user interface created.
-        /// A pointer to the previous owner of the user interface is returned.
-        /// If this parameter is null, the owner of the user interface does not change.</param>
-        /// <returns>The previous user interface level is returned. If an invalid dwUILevel is passed, then INSTALLUILEVEL_NOCHANGE is returned.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiSetpublicUI", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiSetInternalUI(int uiLevel, ref IntPtr hwnd);
-
-        /// <summary>
-        /// PInvoke of MsiSummaryInfoGetPropertyW.
-        /// </summary>
-        /// <param name="summaryInfo">Handle to summary info.</param>
-        /// <param name="property">Property to get value from.</param>
-        /// <param name="dataType">Data type of property.</param>
-        /// <param name="integerValue">Integer to receive integer value.</param>
-        /// <param name="fileTimeValue">File time to receive file time value.</param>
-        /// <param name="stringValueBuf">String buffer to receive string value.</param>
-        /// <param name="stringValueBufSize">Size of string buffer.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiSummaryInfoGetPropertyW", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiSummaryInfoGetProperty(uint summaryInfo, int property, out uint dataType, out int integerValue, ref FILETIME fileTimeValue, StringBuilder stringValueBuf, ref int stringValueBufSize);
-
-        /// <summary>
-        /// PInvoke of MsiViewGetColumnInfo.
-        /// </summary>
-        /// <param name="view">Handle to view.</param>
-        /// <param name="columnInfo">Column info.</param>
-        /// <param name="record">Handle for returned record.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiViewGetColumnInfo", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiViewGetColumnInfo(uint view, int columnInfo, out uint record);
-
-        /// <summary>
-        /// PInvoke of MsiViewExecute.
-        /// </summary>
-        /// <param name="view">Handle of view to execute.</param>
-        /// <param name="record">Handle to a record that supplies the parameters for the view.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiViewExecute", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiViewExecute(uint view, uint record);
-
-        /// <summary>
-        /// PInvoke of MsiViewFetch.
-        /// </summary>
-        /// <param name="view">Handle of view to fetch a row from.</param>
-        /// <param name="record">Handle to receive record info.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiViewFetch", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiViewFetch(uint view, out uint record);
-
-        /// <summary>
-        /// PInvoke of MsiViewModify.
-        /// </summary>
-        /// <param name="view">Handle of view to modify.</param>
-        /// <param name="modifyMode">Modify mode.</param>
-        /// <param name="record">Handle of record.</param>
-        /// <returns>Error code.</returns>
-        [DllImport("msi.dll", EntryPoint = "MsiViewModify", CharSet = CharSet.Unicode, ExactSpelling = true)]
-        public static extern int MsiViewModify(uint view, int modifyMode, uint record);
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/Record.cs b/src/WixToolset.Core.WindowsInstaller/Msi/Record.cs
deleted file mode 100644
index 7342659b..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Msi/Record.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-// 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.Core.WindowsInstaller.Msi
-{
-    using System;
-    using System.ComponentModel;
-    using System.Text;
-
-    /// <summary>
-    /// Wrapper class around msi.dll interop for a record.
-    /// </summary>
-    public sealed class Record : MsiHandle
-    {
-        /// <summary>
-        /// Creates a record with the specified number of fields.
-        /// </summary>
-        /// <param name="fieldCount">Number of fields in record.</param>
-        public Record(int fieldCount)
-        {
-            this.Handle = MsiInterop.MsiCreateRecord(fieldCount);
-            if (0 == this.Handle)
-            {
-                throw new OutOfMemoryException();
-            }
-        }
-
-        /// <summary>
-        /// Creates a record from a handle.
-        /// </summary>
-        /// <param name="handle">Handle to create record from.</param>
-        internal Record(uint handle)
-        {
-            this.Handle = handle;
-        }
-
-        /// <summary>
-        /// Gets a string value at specified location.
-        /// </summary>
-        /// <param name="field">Index into record to get string.</param>
-        public string this[int field]
-        {
-            get { return this.GetString(field); }
-            set { this.SetString(field, (string)value); }
-        }
-
-        /// <summary>
-        /// Determines if the value is null at the specified location.
-        /// </summary>
-        /// <param name="field">Index into record of the field to query.</param>
-        /// <returns>true if the value is null, false otherwise.</returns>
-        public bool IsNull(int field)
-        {
-            int error = MsiInterop.MsiRecordIsNull(this.Handle, field);
-
-            switch (error)
-            {
-                case 0:
-                    return false;
-                case 1:
-                    return true;
-                default:
-                    throw new Win32Exception(error);
-            }
-        }
-
-        /// <summary>
-        /// Gets integer value at specified location.
-        /// </summary>
-        /// <param name="field">Index into record to get integer</param>
-        /// <returns>Integer value</returns>
-        public int GetInteger(int field)
-        {
-            return MsiInterop.MsiRecordGetInteger(this.Handle, field);
-        }
-
-        /// <summary>
-        /// Sets integer value at specified location.
-        /// </summary>
-        /// <param name="field">Index into record to set integer.</param>
-        /// <param name="value">Value to set into record.</param>
-        public void SetInteger(int field, int value)
-        {
-            int error = MsiInterop.MsiRecordSetInteger(this.Handle, field, value);
-            if (0 != error)
-            {
-                throw new Win32Exception(error);
-            }
-        }
-
-        /// <summary>
-        /// Gets string value at specified location.
-        /// </summary>
-        /// <param name="field">Index into record to get string.</param>
-        /// <returns>String value</returns>
-        public string GetString(int field)
-        {
-            int bufferSize = 255;
-            StringBuilder buffer = new StringBuilder(bufferSize);
-            int error = MsiInterop.MsiRecordGetString(this.Handle, field, buffer, ref bufferSize);
-            if (234 == error)
-            {
-                buffer.EnsureCapacity(++bufferSize);
-                error = MsiInterop.MsiRecordGetString(this.Handle, field, buffer, ref bufferSize);
-            }
-
-            if (0 != error)
-            {
-                throw new Win32Exception(error);
-            }
-
-            return (0 < buffer.Length ? buffer.ToString() : null);
-        }
-
-        /// <summary>
-        /// Set string value at specified location
-        /// </summary>
-        /// <param name="field">Index into record to set string.</param>
-        /// <param name="value">Value to set into record</param>
-        public void SetString(int field, string value)
-        {
-            int error = MsiInterop.MsiRecordSetString(this.Handle, field, value);
-            if (0 != error)
-            {
-                throw new Win32Exception(error);
-            }
-        }
-
-        /// <summary>
-        /// Get stream at specified location.
-        /// </summary>
-        /// <param name="field">Index into record to get stream.</param>
-        /// <param name="buffer">buffer to receive bytes from stream.</param>
-        /// <param name="requestedBufferSize">Buffer size to read.</param>
-        /// <returns>Stream read into string.</returns>
-        public int GetStream(int field, byte[] buffer, int requestedBufferSize)
-        {
-            int bufferSize = 255;
-            if (requestedBufferSize > 0)
-            {
-                bufferSize = requestedBufferSize;
-            }
-
-            int error = MsiInterop.MsiRecordReadStream(this.Handle, field, buffer, ref bufferSize);
-            if (0 != error)
-            {
-                throw new Win32Exception(error);
-            }
-
-            return bufferSize;
-        }
-
-        /// <summary>
-        /// Sets a stream at a specified location.
-        /// </summary>
-        /// <param name="field">Index into record to set stream.</param>
-        /// <param name="path">Path to file to read into stream.</param>
-        public void SetStream(int field, string path)
-        {
-            int error = MsiInterop.MsiRecordSetStream(this.Handle, field, path);
-            if (0 != error)
-            {
-                throw new Win32Exception(error);
-            }
-        }
-
-        /// <summary>
-        /// Gets the number of fields in record.
-        /// </summary>
-        /// <returns>Count of fields in record.</returns>
-        public int GetFieldCount()
-        {
-            int size = MsiInterop.MsiRecordGetFieldCount(this.Handle);
-            if (0 > size)
-            {
-                throw new Win32Exception();
-            }
-
-            return size;
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/Session.cs b/src/WixToolset.Core.WindowsInstaller/Msi/Session.cs
deleted file mode 100644
index bb07a501..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Msi/Session.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// 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.Core.WindowsInstaller.Msi
-{
-    using System;
-    using System.Globalization;
-
-    /// <summary>
-    /// Controls the installation process.
-    /// </summary>
-    internal sealed class Session : MsiHandle
-    {
-        /// <summary>
-        /// Instantiate a new Session.
-        /// </summary>
-        /// <param name="database">The database to open.</param>
-        public Session(Database database)
-        {
-            string packagePath = String.Format(CultureInfo.InvariantCulture, "#{0}", (uint)database.Handle);
-
-            uint handle = 0;
-            int error = MsiInterop.MsiOpenPackage(packagePath, out handle);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-            this.Handle = handle;
-        }
-
-        /// <summary>
-        /// Executes a built-in action, custom action, or user-interface wizard action.
-        /// </summary>
-        /// <param name="action">Specifies the action to execute.</param>
-        public void DoAction(string action)
-        {
-            int error = MsiInterop.MsiDoAction(this.Handle, action);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/SummaryInformation.cs b/src/WixToolset.Core.WindowsInstaller/Msi/SummaryInformation.cs
deleted file mode 100644
index 5450671f..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Msi/SummaryInformation.cs
+++ /dev/null
@@ -1,244 +0,0 @@
-// 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.Core.WindowsInstaller.Msi
-{
-    using System;
-    using System.Globalization;
-    using System.Text;
-    using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
-
-    /// <summary>
-    /// Summary information for the MSI files.
-    /// </summary>
-    internal sealed class SummaryInformation : MsiHandle
-    {
-        /// <summary>
-        /// Summary information properties for transforms.
-        /// </summary>
-        public enum Transform
-        {
-            /// <summary>PID_CODEPAGE = code page for the summary information stream</summary>
-            CodePage = 1,
-
-            /// <summary>PID_TITLE = typically just "Transform"</summary>
-            Title = 2,
-
-            /// <summary>PID_SUBJECT = original subject of target</summary>
-            TargetSubject = 3,
-
-            /// <summary>PID_AUTHOR = original manufacturer of target</summary>
-            TargetManufacturer = 4,
-
-            /// <summary>PID_KEYWORDS = keywords for the transform, typically including at least "Installer"</summary>
-            Keywords = 5,
-
-            /// <summary>PID_COMMENTS = describes what this package does</summary>
-            Comments = 6,
-
-            /// <summary>PID_TEMPLATE = target platform;language</summary>
-            TargetPlatformAndLanguage = 7,
-
-            /// <summary>PID_LASTAUTHOR = updated platform;language</summary>
-            UpdatedPlatformAndLanguage = 8,
-
-            /// <summary>PID_REVNUMBER = {productcode}version;{newproductcode}newversion;upgradecode</summary>
-            ProductCodes = 9,
-
-            /// <summary>PID_LASTPRINTED should be null for transforms</summary>
-            Reserved11 = 11,
-
-            ///.<summary>PID_CREATE_DTM = the timestamp when the transform was created</summary>
-            CreationTime = 12,
-
-            /// <summary>PID_PAGECOUNT = minimum installer version</summary>
-            InstallerRequirement = 14,
-
-            /// <summary>PID_CHARCOUNT = validation and error flags</summary>
-            ValidationFlags = 16,
-
-            /// <summary>PID_APPNAME = the application that created the transform</summary>
-            CreatingApplication = 18,
-
-            /// <summary>PID_SECURITY = whether read-only is enforced; should always be 4 for transforms</summary>
-            Security = 19,
-        }
-
-        /// <summary>
-        /// Summary information properties for patches.
-        /// </summary>
-        public enum Patch
-        {
-            /// <summary>PID_CODEPAGE = code page of the summary information stream</summary>
-            CodePage = 1,
-
-            /// <summary>PID_TITLE = a brief description of the package type</summary>
-            Title = 2,
-
-            /// <summary>PID_SUBJECT = package name</summary>
-            PackageName = 3,
-
-            /// <summary>PID_AUTHOR = manufacturer of the patch package</summary>
-            Manufacturer = 4,
-
-            /// <summary>PID_KEYWORDS = alternate sources for the patch package</summary>
-            Sources = 5,
-
-            /// <summary>PID_COMMENTS = general purpose of the patch package</summary>
-            Comments = 6,
-
-            /// <summary>PID_TEMPLATE = semicolon delimited list of ProductCodes</summary>
-            ProductCodes = 7,
-
-            /// <summary>PID_LASTAUTHOR = semicolon delimited list of transform names</summary>
-            TransformNames = 8,
-
-            /// <summary>PID_REVNUMBER = GUID patch code</summary>
-            PatchCode = 9,
-
-            /// <summary>PID_LASTPRINTED should be null for patches</summary>
-            Reserved11 = 11,
-
-            /// <summary>PID_PAGECOUNT should be null for patches</summary>
-            Reserved14 = 14,
-
-            /// <summary>PID_WORDCOUNT = minimum installer version</summary>
-            InstallerRequirement = 15,
-
-            /// <summary>PID_CHARCOUNT should be null for patches</summary>
-            Reserved16 = 16,
-
-            /// <summary>PID_SECURITY = read-only attribute of the patch package</summary>
-            Security = 19,
-        }
-
-        /// <summary>
-        /// Summary information values for the InstallerRequirement property.
-        /// </summary>
-        public enum InstallerRequirement
-        {
-            /// <summary>Any version of the installer will do</summary>
-            Version10 = 1,
-
-            /// <summary>At least 1.2</summary>
-            Version12 = 2,
-
-            /// <summary>At least 2.0</summary>
-            Version20 = 3,
-
-            /// <summary>At least 3.0</summary>
-            Version30 = 4,
-
-            /// <summary>At least 3.1</summary>
-            Version31 = 5,
-        }
-
-        /// <summary>
-        /// Instantiate a new SummaryInformation class from an open database.
-        /// </summary>
-        /// <param name="db">Database to retrieve summary information from.</param>
-        public SummaryInformation(Database db)
-        {
-            if (null == db)
-            {
-                throw new ArgumentNullException("db");
-            }
-
-            uint handle = 0;
-            int error = MsiInterop.MsiGetSummaryInformation(db.Handle, null, 0, ref handle);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-            this.Handle = handle;
-        }
-
-        /// <summary>
-        /// Instantiate a new SummaryInformation class from a database file.
-        /// </summary>
-        /// <param name="databaseFile">The database file.</param>
-        public SummaryInformation(string databaseFile)
-        {
-            if (null == databaseFile)
-            {
-                throw new ArgumentNullException("databaseFile");
-            }
-
-            uint handle = 0;
-            int error = MsiInterop.MsiGetSummaryInformation(0, databaseFile, 0, ref handle);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-            this.Handle = handle;
-        }
-
-        /// <summary>
-        /// Variant types in the summary information table.
-        /// </summary>
-        private enum VT : uint
-        {
-            /// <summary>Variant has not been assigned.</summary>
-            EMPTY = 0,
-
-            /// <summary>Null variant type.</summary>
-            NULL = 1,
-
-            /// <summary>16-bit integer variant type.</summary>
-            I2 = 2,
-
-            /// <summary>32-bit integer variant type.</summary>
-            I4 = 3,
-
-            /// <summary>String variant type.</summary>
-            LPSTR = 30,
-
-            /// <summary>Date time (FILETIME, converted to Variant time) variant type.</summary>
-            FILETIME = 64,
-        }
-
-        /// <summary>
-        /// Gets a summary information property.
-        /// </summary>
-        /// <param name="index">Index of the summary information property.</param>
-        /// <returns>The summary information property.</returns>
-        public string GetProperty(int index)
-        {
-            uint dataType;
-            StringBuilder stringValue = new StringBuilder("");
-            int bufSize = 0;
-            int intValue;
-            FILETIME timeValue;
-            timeValue.dwHighDateTime = 0;
-            timeValue.dwLowDateTime = 0;
-
-            int error = MsiInterop.MsiSummaryInfoGetProperty(this.Handle, index, out dataType, out intValue, ref timeValue, stringValue, ref bufSize);
-            if (234 == error)
-            {
-                stringValue.EnsureCapacity(++bufSize);
-                error = MsiInterop.MsiSummaryInfoGetProperty(this.Handle, index, out dataType, out intValue, ref timeValue, stringValue, ref bufSize);
-            }
-
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-
-            switch ((VT)dataType)
-            {
-                case VT.EMPTY:
-                    return String.Empty;
-                case VT.LPSTR:
-                    return stringValue.ToString();
-                case VT.I2:
-                case VT.I4:
-                    return Convert.ToString(intValue, CultureInfo.InvariantCulture);
-                case VT.FILETIME:
-                    long longFileTime = (((long)timeValue.dwHighDateTime) << 32) | unchecked((uint)timeValue.dwLowDateTime);
-                    DateTime dateTime = DateTime.FromFileTime(longFileTime);
-                    return dateTime.ToString("yyyy/MM/dd HH:mm:ss", CultureInfo.InvariantCulture);
-                default:
-                    throw new InvalidOperationException();
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/View.cs b/src/WixToolset.Core.WindowsInstaller/Msi/View.cs
deleted file mode 100644
index 0fb7fc62..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Msi/View.cs
+++ /dev/null
@@ -1,262 +0,0 @@
-// 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.Core.WindowsInstaller.Msi
-{
-    using System;
-    using System.Collections;
-    using System.Collections.Generic;
-    using System.Globalization;
-
-    /// <summary>
-    /// Enumeration of different modify modes.
-    /// </summary>
-    public enum ModifyView
-    {
-        /// <summary>
-        /// Writes current data in the cursor to a table row. Updates record if the primary 
-        /// keys match an existing row and inserts if they do not match. Fails with a read-only 
-        /// database. This mode cannot be used with a view containing joins.
-        /// </summary>
-        Assign = 3,   // Writes current data in the cursor to a table row. Updates record if the primary keys match an existing row and inserts if they do not match. Fails with a read-only database. This mode cannot be used with a view containing joins.
-
-        /// <summary>
-        /// Remove a row from the table. You must first call the Fetch function with the same
-        /// record. Fails if the row has been deleted. Works only with read-write records. This
-        /// mode cannot be used with a view containing joins.
-        /// </summary>
-        Delete = 6,   // Remove a row from the table. You must first call the MsiViewFetch function with the same record. Fails if the row has been deleted. Works only with read-write records. This mode cannot be used with a view containing joins.
-
-        /// <summary>
-        /// Inserts a record. Fails if a row with the same primary keys exists. Fails with a read-only
-        /// database. This mode cannot be used with a view containing joins.
-        /// </summary>
-        Insert = 1,   // Inserts a record. Fails if a row with the same primary keys exists. Fails with a read-only database. This mode cannot be used with a view containing joins.
-
-        /// <summary>
-        /// Inserts a temporary record. The information is not persistent. Fails if a row with the 
-        /// same primary key exists. Works only with read-write records. This mode cannot be 
-        /// used with a view containing joins.
-        /// </summary>
-        InsertTemporary = 7,   // Inserts a temporary record. The information is not persistent. Fails if a row with the same primary key exists. Works only with read-write records. This mode cannot be used with a view containing joins.
-
-        /// <summary>
-        /// Inserts or validates a record in a table. Inserts if primary keys do not match any row
-        /// and validates if there is a match. Fails if the record does not match the data in
-        /// the table. Fails if there is a record with a duplicate key that is not identical.
-        /// Works only with read-write records. This mode cannot be used with a view containing joins.
-        /// </summary>
-        Merge = 5,   // Inserts or validates a record in a table. Inserts if primary keys do not match any row and validates if there is a match. Fails if the record does not match the data in the table. Fails if there is a record with a duplicate key that is not identical. Works only with read-write records. This mode cannot be used with a view containing joins.
-
-        /// <summary>
-        /// Refreshes the information in the record. Must first call Fetch with the
-        /// same record. Fails for a deleted row. Works with read-write and read-only records.
-        /// </summary>
-        Refresh = 0,   // Refreshes the information in the record. Must first call MsiViewFetch with the same record. Fails for a deleted row. Works with read-write and read-only records.
-
-        /// <summary>
-        /// Updates or deletes and inserts a record into a table. Must first call Fetch with
-        /// the same record. Updates record if the primary keys are unchanged. Deletes old row and
-        /// inserts new if primary keys have changed. Fails with a read-only database. This mode cannot
-        /// be used with a view containing joins.
-        /// </summary>
-        Replace = 4,   // Updates or deletes and inserts a record into a table. Must first call MsiViewFetch with the same record. Updates record if the primary keys are unchanged. Deletes old row and inserts new if primary keys have changed. Fails with a read-only database. This mode cannot be used with a view containing joins.
-
-        /// <summary>
-        /// Refreshes the information in the supplied record without changing the position in the
-        /// result set and without affecting subsequent fetch operations. The record may then
-        /// be used for subsequent Update, Delete, and Refresh. All primary key columns of the
-        /// table must be in the query and the record must have at least as many fields as the
-        /// query. Seek cannot be used with multi-table queries. This mode cannot be used with
-        /// a view containing joins. See also the remarks.
-        /// </summary>
-        Seek = -1,   // Refreshes the information in the supplied record without changing the position in the result set and without affecting subsequent fetch operations. The record may then be used for subsequent Update, Delete, and Refresh. All primary key columns of the table must be in the query and the record must have at least as many fields as the query. Seek cannot be used with multi-table queries. This mode cannot be used with a view containing joins. See also the remarks.
-
-        /// <summary>
-        /// Updates an existing record. Non-primary keys only. Must first call Fetch. Fails with a
-        /// deleted record. Works only with read-write records.
-        /// </summary>
-        Update = 2,   // Updates an existing record. Nonprimary keys only. Must first call MsiViewFetch. Fails with a deleted record. Works only with read-write records.
-    }
-
-    /// <summary>
-    /// Wrapper class for MSI API views.
-    /// </summary>
-    internal sealed class View : MsiHandle
-    {
-        /// <summary>
-        /// Constructor that creates a view given a database handle and a query.
-        /// </summary>
-        /// <param name="db">Handle to the database to run the query on.</param>
-        /// <param name="query">Query to be executed.</param>
-        public View(Database db, string query)
-        {
-            if (null == db)
-            {
-                throw new ArgumentNullException("db");
-            }
-
-            if (null == query)
-            {
-                throw new ArgumentNullException("query");
-            }
-
-            uint handle = 0;
-
-            int error = MsiInterop.MsiDatabaseOpenView(db.Handle, query, out handle);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-
-            this.Handle = handle;
-        }
-
-        /// <summary>
-        /// Enumerator that automatically disposes of the retrieved Records.
-        /// </summary>
-        public IEnumerable<Record> Records => new ViewEnumerable(this);
-
-        /// <summary>
-        /// Executes a view with no customizable parameters.
-        /// </summary>
-        public void Execute()
-        {
-            this.Execute(null);
-        }
-
-        /// <summary>
-        /// Executes a query substituing the values from the records into the customizable parameters 
-        /// in the view.
-        /// </summary>
-        /// <param name="record">Record containing parameters to be substituded into the view.</param>
-        public void Execute(Record record)
-        {
-            var error = MsiInterop.MsiViewExecute(this.Handle, null == record ? 0 : record.Handle);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-        }
-
-        /// <summary>
-        /// Fetches the next row in the view.
-        /// </summary>
-        /// <returns>Returns the fetched record; otherwise null.</returns>
-        public Record Fetch()
-        {
-            var error = MsiInterop.MsiViewFetch(this.Handle, out var recordHandle);
-            if (259 == error)
-            {
-                return null;
-            }
-            else if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-
-            return new Record(recordHandle);
-        }
-
-        /// <summary>
-        /// Updates a fetched record.
-        /// </summary>
-        /// <param name="type">Type of modification mode.</param>
-        /// <param name="record">Record to be modified.</param>
-        public void Modify(ModifyView type, Record record)
-        {
-            int error = MsiInterop.MsiViewModify(this.Handle, Convert.ToInt32(type, CultureInfo.InvariantCulture), record.Handle);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-        }
-
-        /// <summary>
-        /// Returns a record containing column names or definitions.
-        /// </summary>
-        /// <param name="columnType">Specifies a flag indicating what type of information is needed. Either MSICOLINFO_NAMES or MSICOLINFO_TYPES.</param>
-        /// <returns>The record containing information about the column.</returns>
-        public Record GetColumnInfo(int columnType)
-        {
-            uint recordHandle;
-
-            int error = MsiInterop.MsiViewGetColumnInfo(this.Handle, columnType, out recordHandle);
-            if (0 != error)
-            {
-                throw new MsiException(error);
-            }
-
-            return new Record(recordHandle);
-        }
-
-        private class ViewEnumerable : IEnumerable<Record>
-        {
-            private readonly View view;
-
-            public ViewEnumerable(View view) => this.view = view;
-
-            public IEnumerator<Record> GetEnumerator() => new ViewEnumerator(this.view);
-
-            IEnumerator IEnumerable.GetEnumerator() => new ViewEnumerator(this.view);
-        }
-
-        private class ViewEnumerator : IEnumerator<Record>
-        {
-            private readonly View view;
-            private readonly List<Record> records = new List<Record>();
-            private int position = -1;
-            private bool disposed;
-
-            public ViewEnumerator(View view) => this.view = view;
-
-            public Record Current => this.records[this.position];
-
-            object IEnumerator.Current => this.records[this.position];
-
-            public bool MoveNext()
-            {
-                if (this.position + 1 >= this.records.Count)
-                {
-                    var record = this.view.Fetch();
-
-                    if (record == null)
-                    {
-                        return false;
-                    }
-
-                    this.records.Add(record);
-                    this.position = this.records.Count - 1;
-                }
-                else
-                {
-                    ++this.position;
-                }
-
-                return true;
-            }
-
-            public void Reset() => this.position = -1;
-
-            public void Dispose()
-            {
-                this.Dispose(true);
-            }
-
-            protected virtual void Dispose(bool disposing)
-            {
-                if (!this.disposed)
-                {
-                    if (disposing)
-                    {
-                        foreach (var record in this.records)
-                        {
-                            record.Dispose();
-                        }
-                    }
-
-                    this.disposed = true;
-                }
-            }
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/Msi/WixInvalidIdtException.cs b/src/WixToolset.Core.WindowsInstaller/Msi/WixInvalidIdtException.cs
deleted file mode 100644
index a4750723..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Msi/WixInvalidIdtException.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-// 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.Core.WindowsInstaller.Msi
-{
-    using System;
-    using WixToolset.Data;
-
-    /// <summary>
-    /// WiX invalid idt exception.
-    /// </summary>
-    [Serializable]
-    public sealed class WixInvalidIdtException : WixException
-    {
-        /// <summary>
-        /// Instantiate a new WixInvalidIdtException.
-        /// </summary>
-        /// <param name="idtFile">The invalid idt file.</param>
-        public WixInvalidIdtException(string idtFile) :
-            base(ErrorMessages.InvalidIdt(new SourceLineNumber(idtFile), idtFile))
-        {
-        }
-
-        /// <summary>
-        /// Instantiate a new WixInvalidIdtException.
-        /// </summary>
-        /// <param name="idtFile">The invalid idt file.</param>
-        /// <param name="tableName">The table name of the invalid idt file.</param>
-        public WixInvalidIdtException(string idtFile, string tableName) :
-            base(ErrorMessages.InvalidIdt(new SourceLineNumber(idtFile), idtFile, tableName))
-        {
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/MspBackend.cs b/src/WixToolset.Core.WindowsInstaller/MspBackend.cs
index 1caa9e29..c46b6027 100644
--- a/src/WixToolset.Core.WindowsInstaller/MspBackend.cs
+++ b/src/WixToolset.Core.WindowsInstaller/MspBackend.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Core.WindowsInstaller
     using System.IO;
     using System.Linq;
     using WixToolset.Core.WindowsInstaller.Bind;
-    using WixToolset.Core.WindowsInstaller.Msi;
+    using WixToolset.Core.Native.Msi;
     using WixToolset.Core.WindowsInstaller.Unbind;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
diff --git a/src/WixToolset.Core.WindowsInstaller/Ole32/Storage.cs b/src/WixToolset.Core.WindowsInstaller/Ole32/Storage.cs
deleted file mode 100644
index 541d899a..00000000
--- a/src/WixToolset.Core.WindowsInstaller/Ole32/Storage.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// 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.Ole32
-{
-    using System;
-    using System.Runtime.InteropServices;
-    using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
-    using STATSTG = System.Runtime.InteropServices.ComTypes.STATSTG;
-
-    /// <summary>
-    /// Specifies the access mode to use when opening, creating, or deleting a storage object.
-    /// </summary>
-    internal enum StorageMode
-    {
-        /// <summary>
-        /// Indicates that the object is read-only, meaning that modifications cannot be made.
-        /// </summary>
-        Read = 0x0,
-
-        /// <summary>
-        /// Enables you to save changes to the object, but does not permit access to its data.
-        /// </summary>
-        Write = 0x1,
-
-        /// <summary>
-        /// Enables access and modification of object data.
-        /// </summary>
-        ReadWrite = 0x2,
-
-        /// <summary>
-        /// Specifies that subsequent openings of the object are not denied read or write access.
-        /// </summary>
-        ShareDenyNone = 0x40,
-
-        /// <summary>
-        /// Prevents others from subsequently opening the object in Read mode.
-        /// </summary>
-        ShareDenyRead = 0x30,
-
-        /// <summary>
-        /// Prevents others from subsequently opening the object for Write or ReadWrite access.
-        /// </summary>
-        ShareDenyWrite = 0x20,
-
-        /// <summary>
-        /// Prevents others from subsequently opening the object in any mode.
-        /// </summary>
-        ShareExclusive = 0x10,
-
-        /// <summary>
-        /// Opens the storage object with exclusive access to the most recently committed version.
-        /// </summary>
-        Priority = 0x40000,
-
-        /// <summary>
-        /// Indicates that an existing storage object or stream should be removed before the new object replaces it.
-        /// </summary>
-        Create = 0x1000,
-    }
-
-    /// <summary>
-    /// Wrapper for the compound storage file APIs.
-    /// </summary>
-    internal sealed class Storage : IDisposable
-    {
-        private readonly IStorage storage;
-        private bool disposed;
-
-        /// <summary>
-        /// Instantiate a new Storage.
-        /// </summary>
-        /// <param name="storage">The native storage interface.</param>
-        private Storage(IStorage storage)
-        {
-            this.storage = storage;
-        }
-
-        /// <summary>
-        /// Storage destructor.
-        /// </summary>
-        ~Storage()
-        {
-            this.Dispose();
-        }
-
-        /// <summary>
-        /// The IEnumSTATSTG interface enumerates an array of STATSTG structures.
-        /// </summary>
-        [ComImport, Guid("0000000d-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        public interface IEnumSTATSTG
-        {
-            /// <summary>
-            /// Gets a specified number of STATSTG structures.
-            /// </summary>
-            /// <param name="celt">The number of STATSTG structures requested.</param>
-            /// <param name="rgelt">An array of STATSTG structures returned.</param>
-            /// <param name="pceltFetched">The number of STATSTG structures retrieved in the rgelt parameter.</param>
-            /// <returns>The error code.</returns>
-            [PreserveSig]
-            uint Next(uint celt, [MarshalAs(UnmanagedType.LPArray), Out] STATSTG[] rgelt, out uint pceltFetched);
-
-            /// <summary>
-            /// Skips a specified number of STATSTG structures in the enumeration sequence.
-            /// </summary>
-            /// <param name="celt">The number of STATSTG structures to skip.</param>
-            void Skip(uint celt);
-
-            /// <summary>
-            /// Resets the enumeration sequence to the beginning of the STATSTG structure array.
-            /// </summary>
-            void Reset();
-
-            /// <summary>
-            /// Creates a new enumerator that contains the same enumeration state as the current STATSTG structure enumerator.
-            /// </summary>
-            /// <returns>The cloned IEnumSTATSTG interface.</returns>
-            [return: MarshalAs(UnmanagedType.Interface)]
-            IEnumSTATSTG Clone();
-        }
-
-        /// <summary>
-        /// The IStorage interface supports the creation and management of structured storage objects.
-        /// </summary>
-        [ComImport, Guid("0000000b-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        private interface IStorage
-        {
-            /// <summary>
-            /// Creates and opens a stream object with the specified name contained in this storage object.
-            /// </summary>
-            /// <param name="pwcsName">The name of the newly created stream.</param>
-            /// <param name="grfMode">Specifies the access mode to use when opening the newly created stream.</param>
-            /// <param name="reserved1">Reserved for future use; must be zero.</param>
-            /// <param name="reserved2">Reserved for future use; must be zero.</param>
-            /// <param name="ppstm">On return, pointer to the location of the new IStream interface pointer.</param>
-            void CreateStream(string pwcsName, uint grfMode, uint reserved1, uint reserved2, out IStream ppstm);
-
-            /// <summary>
-            /// Opens an existing stream object within this storage object using the specified access permissions in grfMode.
-            /// </summary>
-            /// <param name="pwcsName">The name of the stream to open.</param>
-            /// <param name="reserved1">Reserved for future use; must be NULL.</param>
-            /// <param name="grfMode">Specifies the access mode to be assigned to the open stream.</param>
-            /// <param name="reserved2">Reserved for future use; must be zero.</param>
-            /// <param name="ppstm">A pointer to IStream pointer variable that receives the interface pointer to the newly opened stream object.</param>
-            void OpenStream(string pwcsName, IntPtr reserved1, uint grfMode, uint reserved2, out IStream ppstm);
-
-            /// <summary>
-            /// Creates and opens a new storage object nested within this storage object with the specified name in the specified access mode.
-            /// </summary>
-            /// <param name="pwcsName">The name of the newly created storage object.</param>
-            /// <param name="grfMode">A value that specifies the access mode to use when opening the newly created storage object.</param>
-            /// <param name="reserved1">Reserved for future use; must be zero.</param>
-            /// <param name="reserved2">Reserved for future use; must be zero.</param>
-            /// <param name="ppstg">A pointer, when successful, to the location of the IStorage pointer to the newly created storage object.</param>
-            void CreateStorage(string pwcsName, uint grfMode, uint reserved1, uint reserved2, out IStorage ppstg);
-
-            /// <summary>
-            /// Opens an existing storage object with the specified name in the specified access mode.
-            /// </summary>
-            /// <param name="pwcsName">The name of the storage object to open.</param>
-            /// <param name="pstgPriority">Must be NULL.</param>
-            /// <param name="grfMode">Specifies the access mode to use when opening the storage object.</param>
-            /// <param name="snbExclude">Must be NULL.</param>
-            /// <param name="reserved">Reserved for future use; must be zero.</param>
-            /// <param name="ppstg">When successful, pointer to the location of an IStorage pointer to the opened storage object.</param>
-            void OpenStorage(string pwcsName, IStorage pstgPriority, uint grfMode, IntPtr snbExclude, uint reserved, out IStorage ppstg);
-
-            /// <summary>
-            /// Copies the entire contents of an open storage object to another storage object.
-            /// </summary>
-            /// <param name="ciidExclude">The number of elements in the array pointed to by rgiidExclude.</param>
-            /// <param name="rgiidExclude">An array of interface identifiers (IIDs) that either the caller knows about and does not want
-            /// copied or that the storage object does not support, but whose state the caller will later explicitly copy.</param>
-            /// <param name="snbExclude">A string name block (refer to SNB) that specifies a block of storage or stream objects that are not to be copied to the destination.</param>
-            /// <param name="pstgDest">A pointer to the open storage object into which this storage object is to be copied.</param>
-            void CopyTo(uint ciidExclude, IntPtr rgiidExclude, IntPtr snbExclude, IStorage pstgDest);
-
-            /// <summary>
-            /// Copies or moves a substorage or stream from this storage object to another storage object.
-            /// </summary>
-            /// <param name="pwcsName">The name of the element in this storage object to be moved or copied.</param>
-            /// <param name="pstgDest">IStorage pointer to the destination storage object.</param>
-            /// <param name="pwcsNewName">The new name for the element in its new storage object.</param>
-            /// <param name="grfFlags">Specifies whether the operation should be a move (STGMOVE_MOVE) or a copy (STGMOVE_COPY).</param>
-            void MoveElementTo(string pwcsName, IStorage pstgDest, string pwcsNewName, uint grfFlags);
-
-            /// <summary>
-            /// Reflects changes for a transacted storage object to the parent level.
-            /// </summary>
-            /// <param name="grfCommitFlags">Controls how the changes are committed to the storage object.</param>
-            void Commit(uint grfCommitFlags);
-
-            /// <summary>
-            /// Discards all changes that have been made to the storage object since the last commit operation.
-            /// </summary>
-            void Revert();
-
-            /// <summary>
-            /// Returns an enumerator object that can be used to enumerate the storage and stream objects contained within this storage object.
-            /// </summary>
-            /// <param name="reserved1">Reserved for future use; must be zero.</param>
-            /// <param name="reserved2">Reserved for future use; must be NULL.</param>
-            /// <param name="reserved3">Reserved for future use; must be zero.</param>
-            /// <param name="ppenum">Pointer to IEnumSTATSTG* pointer variable that receives the interface pointer to the new enumerator object.</param>
-            void EnumElements(uint reserved1, IntPtr reserved2, uint reserved3, out IEnumSTATSTG ppenum);
-
-            /// <summary>
-            /// Removes the specified storage or stream from this storage object.
-            /// </summary>
-            /// <param name="pwcsName">The name of the storage or stream to be removed.</param>
-            void DestroyElement(string pwcsName);
-
-            /// <summary>
-            /// Renames the specified storage or stream in this storage object.
-            /// </summary>
-            /// <param name="pwcsOldName">The name of the substorage or stream to be changed.</param>
-            /// <param name="pwcsNewName">The new name for the specified substorage or stream.</param>
-            void RenameElement(string pwcsOldName, string pwcsNewName);
-
-            /// <summary>
-            /// Sets the modification, access, and creation times of the indicated storage element, if supported by the underlying file system.
-            /// </summary>
-            /// <param name="pwcsName">The name of the storage object element whose times are to be modified.</param>
-            /// <param name="pctime">Either the new creation time for the element or NULL if the creation time is not to be modified.</param>
-            /// <param name="patime">Either the new access time for the element or NULL if the access time is not to be modified.</param>
-            /// <param name="pmtime">Either the new modification time for the element or NULL if the modification time is not to be modified.</param>
-            void SetElementTimes(string pwcsName, FILETIME pctime, FILETIME patime, FILETIME pmtime);
-
-            /// <summary>
-            /// Assigns the specified CLSID to this storage object.
-            /// </summary>
-            /// <param name="clsid">The CLSID that is to be associated with the storage object.</param>
-            void SetClass(Guid clsid);
-
-            /// <summary>
-            /// Stores up to 32 bits of state information in this storage object.
-            /// </summary>
-            /// <param name="grfStateBits">Specifies the new values of the bits to set.</param>
-            /// <param name="grfMask">A binary mask indicating which bits in grfStateBits are significant in this call.</param>
-            void SetStateBits(uint grfStateBits, uint grfMask);
-
-            /// <summary>
-            /// Returns the STATSTG structure for this open storage object.
-            /// </summary>
-            /// <param name="pstatstg">On return, pointer to a STATSTG structure where this method places information about the open storage object.</param>
-            /// <param name="grfStatFlag">Specifies that some of the members in the STATSTG structure are not returned, thus saving a memory allocation operation.</param>
-            void Stat(out STATSTG pstatstg, uint grfStatFlag);
-        }
-
-        /// <summary>
-        /// The IStream interface lets you read and write data to stream objects.
-        /// </summary>
-        [ComImport, Guid("0000000c-0000-0000-C000-000000000046"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-        private interface IStream
-        {
-            /// <summary>
-            /// Reads a specified number of bytes from the stream object into memory starting at the current seek pointer.
-            /// </summary>
-            /// <param name="pv">A pointer to the buffer which the stream data is read into.</param>
-            /// <param name="cb">The number of bytes of data to read from the stream object.</param>
-            /// <param name="pcbRead">A pointer to a ULONG variable that receives the actual number of bytes read from the stream object.</param>
-            void Read([Out, MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbRead);
-
-            /// <summary>
-            /// Writes a specified number of bytes into the stream object starting at the current seek pointer.
-            /// </summary>
-            /// <param name="pv">A pointer to the buffer that contains the data that is to be written to the stream.</param>
-            /// <param name="cb">The number of bytes of data to attempt to write into the stream.</param>
-            /// <param name="pcbWritten">A pointer to a ULONG variable where this method writes the actual number of bytes written to the stream object.</param>
-            void Write([MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] byte[] pv, int cb, IntPtr pcbWritten);
-
-            /// <summary>
-            /// Changes the seek pointer to a new location relative to the beginning of the stream, the end of the stream, or the current seek pointer.
-            /// </summary>
-            /// <param name="dlibMove">The displacement to be added to the location indicated by the dwOrigin parameter.</param>
-            /// <param name="dwOrigin">The origin for the displacement specified in dlibMove.</param>
-            /// <param name="plibNewPosition">A pointer to the location where this method writes the value of the new seek pointer from the beginning of the stream.</param>
-            void Seek(long dlibMove, int dwOrigin, IntPtr plibNewPosition);
-
-            /// <summary>
-            /// Changes the size of the stream object.
-            /// </summary>
-            /// <param name="libNewSize">Specifies the new size of the stream as a number of bytes.</param>
-            void SetSize(long libNewSize);
-
-            /// <summary>
-            /// Copies a specified number of bytes from the current seek pointer in the stream to the current seek pointer in another stream.
-            /// </summary>
-            /// <param name="pstm">A pointer to the destination stream.</param>
-            /// <param name="cb">The number of bytes to copy from the source stream.</param>
-            /// <param name="pcbRead">A pointer to the location where this method writes the actual number of bytes read from the source.</param>
-            /// <param name="pcbWritten">A pointer to the location where this method writes the actual number of bytes written to the destination.</param>
-            void CopyTo(IStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten);
-
-            /// <summary>
-            /// Ensures that any changes made to a stream object open in transacted mode are reflected in the parent storage object.
-            /// </summary>
-            /// <param name="grfCommitFlags">Controls how the changes for the stream object are committed.</param>
-            void Commit(int grfCommitFlags);
-
-            /// <summary>
-            /// Discards all changes that have been made to a transacted stream since the last call to IStream::Commit.
-            /// </summary>
-            void Revert();
-
-            /// <summary>
-            /// Restricts access to a specified range of bytes in the stream.
-            /// </summary>
-            /// <param name="libOffset">Integer that specifies the byte offset for the beginning of the range.</param>
-            /// <param name="cb">Integer that specifies the length of the range, in bytes, to be restricted.</param>
-            /// <param name="dwLockType">Specifies the restrictions being requested on accessing the range.</param>
-            void LockRegion(long libOffset, long cb, int dwLockType);
-
-            /// <summary>
-            /// Removes the access restriction on a range of bytes previously restricted with IStream::LockRegion.
-            /// </summary>
-            /// <param name="libOffset">Specifies the byte offset for the beginning of the range.</param>
-            /// <param name="cb">Specifies, in bytes, the length of the range to be restricted.</param>
-            /// <param name="dwLockType">Specifies the access restrictions previously placed on the range.</param>
-            void UnlockRegion(long libOffset, long cb, int dwLockType);
-
-            /// <summary>
-            /// Retrieves the STATSTG structure for this stream.
-            /// </summary>
-            /// <param name="pstatstg">Pointer to a STATSTG structure where this method places information about this stream object.</param>
-            /// <param name="grfStatFlag">Specifies that this method does not return some of the members in the STATSTG structure, thus saving a memory allocation operation.</param>
-            void Stat(out STATSTG pstatstg, int grfStatFlag);
-
-            /// <summary>
-            /// Creates a new stream object that references the same bytes as the original stream but provides a separate seek pointer to those bytes.
-            /// </summary>
-            /// <param name="ppstm">When successful, pointer to the location of an IStream pointer to the new stream object.</param>
-            void Clone(out IStream ppstm);
-        }
-
-        /// <summary>
-        /// Creates a new compound file storage object.
-        /// </summary>
-        /// <param name="storageFile">The compound file being created.</param>
-        /// <param name="mode">Specifies the access mode to use when opening the new storage object.</param>
-        /// <returns>The created Storage object.</returns>
-        public static Storage CreateDocFile(string storageFile, StorageMode mode)
-        {
-            IStorage storage = NativeMethods.StgCreateDocfile(storageFile, (uint)mode, 0);
-
-            return new Storage(storage);
-        }
-
-        /// <summary>
-        /// Opens an existing root storage object in the file system.
-        /// </summary>
-        /// <param name="storageFile">The file that contains the storage object to open.</param>
-        /// <param name="mode">Specifies the access mode to use to open the storage object.</param>
-        /// <returns>The created Storage object.</returns>
-        public static Storage Open(string storageFile, StorageMode mode)
-        {
-            IStorage storage = NativeMethods.StgOpenStorage(storageFile, IntPtr.Zero, (uint)mode, IntPtr.Zero, 0);
-
-            return new Storage(storage);
-        }
-
-        /// <summary>
-        /// Copies the entire contents of this open storage object into another Storage object.
-        /// </summary>
-        /// <param name="destinationStorage">The destination Storage object.</param>
-        public void CopyTo(Storage destinationStorage)
-        {
-            this.storage.CopyTo(0, IntPtr.Zero, IntPtr.Zero, destinationStorage.storage);
-        }
-
-        /// <summary>
-        /// Opens an existing Storage object with the specified name according to the specified access mode.
-        /// </summary>
-        /// <param name="name">The name of the Storage object.</param>
-        /// <returns>The opened Storage object.</returns>
-        public Storage OpenStorage(string name)
-        {
-            IStorage subStorage;
-
-            this.storage.OpenStorage(name, null, (uint)(StorageMode.Read | StorageMode.ShareExclusive), IntPtr.Zero, 0, out subStorage);
-
-            return new Storage(subStorage);
-        }
-
-        /// <summary>
-        /// Disposes the managed and unmanaged objects in this object.
-        /// </summary>
-        public void Dispose()
-        {
-            if (!this.disposed)
-            {
-                Marshal.ReleaseComObject(this.storage);
-
-                this.disposed = true;
-            }
-
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// The native methods.
-        /// </summary>
-        private sealed class NativeMethods
-        {
-            /// <summary>
-            /// Protect the constructor since this class only contains static methods.
-            /// </summary>
-            private NativeMethods()
-            {
-            }
-
-            /// <summary>
-            /// Creates a new compound file storage object.
-            /// </summary>
-            /// <param name="pwcsName">The name for the compound file being created.</param>
-            /// <param name="grfMode">Specifies the access mode to use when opening the new storage object.</param>
-            /// <param name="reserved">Reserved for future use; must be zero.</param>
-            /// <returns>A pointer to the location of the IStorage pointer to the new storage object.</returns>
-            [DllImport("ole32.dll", PreserveSig = false)]
-            [return: MarshalAs(UnmanagedType.Interface)]
-            internal static extern IStorage StgCreateDocfile([MarshalAs(UnmanagedType.LPWStr)] string pwcsName, uint grfMode, uint reserved);
-
-            /// <summary>
-            /// Opens an existing root storage object in the file system.
-            /// </summary>
-            /// <param name="pwcsName">The file that contains the storage object to open.</param>
-            /// <param name="pstgPriority">Most often NULL.</param>
-            /// <param name="grfMode">Specifies the access mode to use to open the storage object.</param>
-            /// <param name="snbExclude">If not NULL, pointer to a block of elements in the storage to be excluded as the storage object is opened.</param>
-            /// <param name="reserved">Indicates reserved for future use; must be zero.</param>
-            /// <returns>A pointer to a IStorage* pointer variable that receives the interface pointer to the opened storage.</returns>
-            [DllImport("ole32.dll", PreserveSig = false)]
-            [return: MarshalAs(UnmanagedType.Interface)]
-            internal static extern IStorage StgOpenStorage([MarshalAs(UnmanagedType.LPWStr)] string pwcsName, IntPtr pstgPriority, uint grfMode, IntPtr snbExclude, uint reserved);
-        }
-    }
-}
diff --git a/src/WixToolset.Core.WindowsInstaller/PatchAPI/PatchInterop.cs b/src/WixToolset.Core.WindowsInstaller/PatchAPI/PatchInterop.cs
deleted file mode 100644
index 3874d8e7..00000000
--- a/src/WixToolset.Core.WindowsInstaller/PatchAPI/PatchInterop.cs
+++ /dev/null
@@ -1,989 +0,0 @@
-// 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.PatchAPI
-{
-    using System;
-    using System.Collections.Generic;
-    using System.Diagnostics.CodeAnalysis;
-    using System.Globalization;
-    using System.Runtime.InteropServices;
-    using WixToolset.Data.Symbols;
-
-    /// <summary>
-    /// Interop class for the mspatchc.dll.
-    /// </summary>
-    internal static class PatchInterop
-    {
-        // From WinError.h in the Platform SDK
-        internal const ushort FACILITY_WIN32 = 7;
-
-        /// <summary>
-        /// Parse a number from text in either hex or decimal.
-        /// </summary>
-        /// <param name="source">Source value. Treated as hex if it starts 0x (or 0X), decimal otherwise.</param>
-        /// <returns>Numeric value that source represents.</returns>
-        static internal UInt32 ParseHexOrDecimal(string source)
-        {
-            string value = source.Trim();
-            if (String.Equals(value.Substring(0, 2), "0x", StringComparison.OrdinalIgnoreCase))
-            {
-                return UInt32.Parse(value.Substring(2), NumberStyles.AllowHexSpecifier, CultureInfo.InvariantCulture.NumberFormat);
-            }
-            else
-            {
-                return UInt32.Parse(value, CultureInfo.InvariantCulture.NumberFormat);
-            }
-        }
-
-        /// <summary>
-        /// Create a binary delta file.
-        /// </summary>
-        /// <param name="deltaFile">Name of the delta file to create.</param>
-        /// <param name="targetFile">Name of updated file.</param>
-        /// <param name="targetSymbolPath">Optional paths to updated file's symbols.</param>
-        /// <param name="targetRetainOffsets">Optional offsets to the delta retain sections in the updated file.</param>
-        /// <param name="basisFiles">Optional array of target files.</param>
-        /// <param name="basisSymbolPaths">Optional array of target files' symbol paths (must match basisFiles array).</param>
-        /// <param name="basisIgnoreLengths">Optional array of target files' delta ignore section lengths (must match basisFiles array)(each entry must match basisIgnoreOffsets entries).</param>
-        /// <param name="basisIgnoreOffsets">Optional array of target files' delta ignore section offsets (must match basisFiles array)(each entry must match basisIgnoreLengths entries).</param>
-        /// <param name="basisRetainLengths">Optional array of target files' delta protect section lengths (must match basisFiles array)(each entry must match basisRetainOffsets and targetRetainOffsets entries).</param>
-        /// <param name="basisRetainOffsets">Optional array of target files' delta protect section offsets (must match basisFiles array)(each entry must match basisRetainLengths and targetRetainOffsets entries).</param>
-        /// <param name="apiPatchingSymbolFlags">ApiPatchingSymbolFlags value.</param>
-        /// <param name="optimizePatchSizeForLargeFiles">OptimizePatchSizeForLargeFiles value.</param>
-        /// <param name="retainRangesIgnored">Flag to indicate retain ranges were ignored due to mismatch.</param>
-        /// <returns>true if delta file was created, false if whole file should be used instead.</returns>
-        static public bool CreateDelta(
-                string deltaFile,
-                string targetFile,
-                string targetSymbolPath,
-                string targetRetainOffsets,
-                string[] basisFiles,
-                string[] basisSymbolPaths,
-                string[] basisIgnoreLengths,
-                string[] basisIgnoreOffsets,
-                string[] basisRetainLengths,
-                string[] basisRetainOffsets,
-                PatchSymbolFlags apiPatchingSymbolFlags,
-                bool optimizePatchSizeForLargeFiles,
-                out bool retainRangesIgnored
-                )
-        {
-            retainRangesIgnored = false;
-            if (0 != (apiPatchingSymbolFlags & ~(PatchSymbolFlags.PatchSymbolNoImagehlp | PatchSymbolFlags.PatchSymbolNoFailures | PatchSymbolFlags.PatchSymbolUndecoratedToo)))
-            {
-                throw new ArgumentOutOfRangeException("apiPatchingSymbolFlags");
-            }
-
-            if (null == deltaFile || 0 == deltaFile.Length)
-            {
-                throw new ArgumentNullException("deltaFile");
-            }
-
-            if (null == targetFile || 0 == targetFile.Length)
-            {
-                throw new ArgumentNullException("targetFile");
-            }
-
-            if (null == basisFiles || 0 == basisFiles.Length)
-            {
-                return false;
-            }
-            uint countOldFiles = (uint)basisFiles.Length;
-
-            if (null != basisSymbolPaths)
-            {
-                if (0 != basisSymbolPaths.Length)
-                {
-                    if ((uint)basisSymbolPaths.Length != countOldFiles)
-                    {
-                        throw new ArgumentOutOfRangeException("basisSymbolPaths");
-                    }
-                }
-            }
-            // a null basisSymbolPaths is allowed.
-
-            if (null != basisIgnoreLengths)
-            {
-                if (0 != basisIgnoreLengths.Length)
-                {
-                    if ((uint)basisIgnoreLengths.Length != countOldFiles)
-                    {
-                        throw new ArgumentOutOfRangeException("basisIgnoreLengths");
-                    }
-                }
-            }
-            else
-            {
-                basisIgnoreLengths = new string[countOldFiles];
-            }
-
-            if (null != basisIgnoreOffsets)
-            {
-                if (0 != basisIgnoreOffsets.Length)
-                {
-                    if ((uint)basisIgnoreOffsets.Length != countOldFiles)
-                    {
-                        throw new ArgumentOutOfRangeException("basisIgnoreOffsets");
-                    }
-                }
-            }
-            else
-            {
-                basisIgnoreOffsets = new string[countOldFiles];
-            }
-
-            if (null != basisRetainLengths)
-            {
-                if (0 != basisRetainLengths.Length)
-                {
-                    if ((uint)basisRetainLengths.Length != countOldFiles)
-                    {
-                        throw new ArgumentOutOfRangeException("basisRetainLengths");
-                    }
-                }
-            }
-            else
-            {
-                basisRetainLengths = new string[countOldFiles];
-            }
-
-            if (null != basisRetainOffsets)
-            {
-                if (0 != basisRetainOffsets.Length)
-                {
-                    if ((uint)basisRetainOffsets.Length != countOldFiles)
-                    {
-                        throw new ArgumentOutOfRangeException("basisRetainOffsets");
-                    }
-                }
-            }
-            else
-            {
-                basisRetainOffsets = new string[countOldFiles];
-            }
-
-            PatchOptionData pod = new PatchOptionData();
-            pod.symbolOptionFlags = apiPatchingSymbolFlags;
-            pod.newFileSymbolPath = targetSymbolPath;
-            pod.oldFileSymbolPathArray = basisSymbolPaths;
-            pod.extendedOptionFlags = 0;
-            PatchOldFileInfoW[] oldFileInfoArray = new PatchOldFileInfoW[countOldFiles];
-            string[] newRetainOffsetArray = ((null == targetRetainOffsets) ? new string[0] : targetRetainOffsets.Split(','));
-            for (uint i = 0; i < countOldFiles; ++i)
-            {
-                PatchOldFileInfoW ofi = new PatchOldFileInfoW();
-                ofi.oldFileName = basisFiles[i];
-                string[] ignoreLengthArray = ((null == basisIgnoreLengths[i]) ? new string[0] : basisIgnoreLengths[i].Split(','));
-                string[] ignoreOffsetArray = ((null == basisIgnoreOffsets[i]) ? new string[0] : basisIgnoreOffsets[i].Split(','));
-                string[] retainLengthArray = ((null == basisRetainLengths[i]) ? new string[0] : basisRetainLengths[i].Split(','));
-                string[] retainOffsetArray = ((null == basisRetainOffsets[i]) ? new string[0] : basisRetainOffsets[i].Split(','));
-                // Validate inputs
-                if (ignoreLengthArray.Length != ignoreOffsetArray.Length)
-                {
-                    throw new ArgumentOutOfRangeException("basisIgnoreLengths");
-                }
-
-                if (retainLengthArray.Length != retainOffsetArray.Length)
-                {
-                    throw new ArgumentOutOfRangeException("basisRetainLengths");
-                }
-
-                if (newRetainOffsetArray.Length != retainOffsetArray.Length)
-                {
-                    // remove all retain range information
-                    retainRangesIgnored = true;
-                    for (uint j = 0; j < countOldFiles; ++j)
-                    {
-                        basisRetainLengths[j] = null;
-                        basisRetainOffsets[j] = null;
-                    }
-                    retainLengthArray = new string[0];
-                    retainOffsetArray = new string[0];
-                    newRetainOffsetArray = new string[0];
-                    for (uint j = 0; j < oldFileInfoArray.Length; ++j)
-                    {
-                        oldFileInfoArray[j].retainRange = null;
-                    }
-                }
-
-                // Populate IgnoreRange structure
-                PatchIgnoreRange[] ignoreArray = null;
-                if (0 != ignoreLengthArray.Length)
-                {
-                    ignoreArray = new PatchIgnoreRange[ignoreLengthArray.Length];
-                    for (int j = 0; j < ignoreLengthArray.Length; ++j)
-                    {
-                        PatchIgnoreRange ignoreRange = new PatchIgnoreRange();
-                        ignoreRange.offsetInOldFile = ParseHexOrDecimal(ignoreOffsetArray[j]);
-                        ignoreRange.lengthInBytes = ParseHexOrDecimal(ignoreLengthArray[j]);
-                        ignoreArray[j] = ignoreRange;
-                    }
-                    ofi.ignoreRange = ignoreArray;
-                }
-
-                PatchRetainRange[] retainArray = null;
-                if (0 != newRetainOffsetArray.Length)
-                {
-                    retainArray = new PatchRetainRange[retainLengthArray.Length];
-                    for (int j = 0; j < newRetainOffsetArray.Length; ++j)
-                    {
-                        PatchRetainRange retainRange = new PatchRetainRange();
-                        retainRange.offsetInOldFile = ParseHexOrDecimal(retainOffsetArray[j]);
-                        retainRange.lengthInBytes = ParseHexOrDecimal(retainLengthArray[j]);
-                        retainRange.offsetInNewFile = ParseHexOrDecimal(newRetainOffsetArray[j]);
-                        retainArray[j] = retainRange;
-                    }
-                    ofi.retainRange = retainArray;
-                }
-                oldFileInfoArray[i] = ofi;
-            }
-
-            if (CreatePatchFileExW(
-                    countOldFiles,
-                    oldFileInfoArray,
-                    targetFile,
-                    deltaFile,
-                    PatchOptionFlags(optimizePatchSizeForLargeFiles),
-                    pod,
-                    null,
-                    IntPtr.Zero))
-            {
-                return true;
-            }
-
-            // determine if this is an error or a need to use whole file.
-            int err = Marshal.GetLastWin32Error();
-            switch (err)
-            {
-                case unchecked((int)ERROR_PATCH_BIGGER_THAN_COMPRESSED):
-                    break;
-
-                // too late to exclude this file -- should have been caught before
-                case unchecked((int)ERROR_PATCH_SAME_FILE):
-                default:
-                    throw new System.ComponentModel.Win32Exception(err);
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// Extract the delta header.
-        /// </summary>
-        /// <param name="delta">Name of delta file.</param>
-        /// <param name="deltaHeader">Name of file to create with the delta's header.</param>
-        static public void ExtractDeltaHeader(string delta, string deltaHeader)
-        {
-            if (!ExtractPatchHeaderToFileW(delta, deltaHeader))
-            {
-                throw new System.ComponentModel.Win32Exception(Marshal.GetLastWin32Error());
-            }
-        }
-
-        /// <summary>
-        /// Returns the PatchOptionFlags to use.
-        /// </summary>
-        /// <param name="optimizeForLargeFiles">True if optimizing for large files.</param>
-        /// <returns>PATCH_OPTION_FLAG values</returns>
-        static private UInt32 PatchOptionFlags(bool optimizeForLargeFiles)
-        {
-            UInt32 flags = PATCH_OPTION_FAIL_IF_SAME_FILE | PATCH_OPTION_FAIL_IF_BIGGER | PATCH_OPTION_USE_LZX_BEST;
-            if (optimizeForLargeFiles)
-            {
-                flags |= PATCH_OPTION_USE_LZX_LARGE;
-            }
-            return flags;
-        }
-
-        //---------------------------------------------------------------------
-        // From PatchApi.h
-        //---------------------------------------------------------------------
-
-        //
-        // The following contants can be combined and used as the OptionFlags
-        // parameter in the patch creation apis.
-
-        internal const uint PATCH_OPTION_USE_BEST = 0x00000000; // auto choose best (slower)
-
-        internal const uint PATCH_OPTION_USE_LZX_BEST = 0x00000003; // auto choose best of LXZ A/B (but not large)
-        internal const uint PATCH_OPTION_USE_LZX_A = 0x00000001; // normal
-        internal const uint PATCH_OPTION_USE_LXZ_B = 0x00000002; // better on some x86 binaries
-        internal const uint PATCH_OPTION_USE_LZX_LARGE = 0x00000004; // better support for large files (requires 5.1 or higher applyer)
-
-        internal const uint PATCH_OPTION_NO_BINDFIX = 0x00010000; // PE bound imports
-        internal const uint PATCH_OPTION_NO_LOCKFIX = 0x00020000; // PE smashed locks
-        internal const uint PATCH_OPTION_NO_REBASE = 0x00040000; // PE rebased image
-        internal const uint PATCH_OPTION_FAIL_IF_SAME_FILE = 0x00080000; // don't create if same
-        internal const uint PATCH_OPTION_FAIL_IF_BIGGER = 0x00100000; // fail if patch is larger than simply compressing new file (slower)
-        internal const uint PATCH_OPTION_NO_CHECKSUM = 0x00200000; // PE checksum zero
-        internal const uint PATCH_OPTION_NO_RESTIMEFIX = 0x00400000; // PE resource timestamps
-        internal const uint PATCH_OPTION_NO_TIMESTAMP = 0x00800000; // don't store new file timestamp in patch
-        internal const uint PATCH_OPTION_SIGNATURE_MD5 = 0x01000000; // use MD5 instead of CRC (reserved for future support)
-        internal const uint PATCH_OPTION_INTERLEAVE_FILES = 0x40000000; // better support for large files (requires 5.2 or higher applyer)
-        internal const uint PATCH_OPTION_RESERVED1 = 0x80000000; // (used internally)
-
-        internal const uint PATCH_OPTION_VALID_FLAGS = 0xC0FF0007;
-
-        //
-        // The following flags are used with PATCH_OPTION_DATA ExtendedOptionFlags:
-        //
-
-        internal const uint PATCH_TRANSFORM_PE_RESOURCE_2 = 0x00000100; // better handling of PE resources (requires 5.2 or higher applyer)
-        internal const uint PATCH_TRANSFORM_PE_IRELOC_2 = 0x00000200; // better handling of PE stripped relocs (requires 5.2 or higher applyer)
-
-        //
-        // In addition to the standard Win32 error codes, the following error codes may
-        // be returned via GetLastError() when one of the patch APIs fails.
-
-        internal const uint ERROR_PATCH_ENCODE_FAILURE = 0xC00E3101; // create
-        internal const uint ERROR_PATCH_INVALID_OPTIONS = 0xC00E3102; // create
-        internal const uint ERROR_PATCH_SAME_FILE = 0xC00E3103; // create
-        internal const uint ERROR_PATCH_RETAIN_RANGES_DIFFER = 0xC00E3104; // create
-        internal const uint ERROR_PATCH_BIGGER_THAN_COMPRESSED = 0xC00E3105; // create
-        internal const uint ERROR_PATCH_IMAGEHLP_FALURE = 0xC00E3106; // create
-
-        /// <summary>
-        /// Delegate type that the PatchAPI calls for progress notification.
-        /// </summary>
-        /// <param name="context">.</param>
-        /// <param name="currentPosition">.</param>
-        /// <param name="maxPosition">.</param>
-        /// <returns>True for success</returns>
-        public delegate bool PatchProgressCallback(
-                IntPtr context,
-                uint currentPosition,
-                uint maxPosition
-                );
-
-        /// <summary>
-        /// Delegate type that the PatchAPI calls for patch symbol load information.
-        /// </summary>
-        /// <param name="whichFile">.</param>
-        /// <param name="symbolFileName">.</param>
-        /// <param name="symType">.</param>
-        /// <param name="symbolFileCheckSum">.</param>
-        /// <param name="symbolFileTimeDate">.</param>
-        /// <param name="imageFileCheckSum">.</param>
-        /// <param name="imageFileTimeDate">.</param>
-        /// <param name="context">.</param>
-        /// <returns>???</returns>
-        public delegate bool PatchSymloadCallback(
-                                                 uint whichFile, // 0 for new file, 1 for first old file, etc
-                [MarshalAs(UnmanagedType.LPStr)] string symbolFileName,
-                                                 uint symType,   // see SYM_TYPE in imagehlp.h
-                                                 uint symbolFileCheckSum,
-                                                 uint symbolFileTimeDate,
-                                                 uint imageFileCheckSum,
-                                                 uint imageFileTimeDate,
-                                                 IntPtr context
-                                                 );
-
-        /// <summary>
-        /// Wraps PATCH_IGNORE_RANGE
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        internal class PatchIgnoreRange
-        {
-            public uint offsetInOldFile;
-            public uint lengthInBytes;
-        }
-
-        /// <summary>
-        /// Wraps PATCH_RETAIN_RANGE
-        /// </summary>
-        [StructLayout(LayoutKind.Sequential)]
-        internal class PatchRetainRange
-        {
-            public uint offsetInOldFile;
-            public uint lengthInBytes;
-            public uint offsetInNewFile;
-        }
-
-        /// <summary>
-        /// Wraps PATCH_OLD_FILE_INFO (except for the OldFile~ portion)
-        /// </summary>
-        internal class PatchOldFileInfo
-        {
-            public PatchIgnoreRange[] ignoreRange;
-            public PatchRetainRange[] retainRange;
-        }
-
-        /// <summary>
-        /// Wraps PATCH_OLD_FILE_INFO_W
-        /// </summary>
-        internal class PatchOldFileInfoW : PatchOldFileInfo
-        {
-            public string oldFileName;
-        }
-
-        /// <summary>
-        /// Wraps each PATCH_INTERLEAVE_MAP Range
-        /// </summary>
-        [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses"), StructLayout(LayoutKind.Sequential)]
-        internal class PatchInterleaveMapRange
-        {
-            public uint oldOffset;
-            public uint oldLength;
-            public uint newLength;
-        }
-
-        /// <summary>
-        /// Wraps PATCH_INTERLEAVE_MAP
-        /// </summary>
-        internal class PatchInterleaveMap
-        {
-            public PatchInterleaveMapRange[] ranges = null;
-        }
-
-
-        /// <summary>
-        /// Wraps PATCH_OPTION_DATA
-        /// </summary>
-        [BestFitMapping(false, ThrowOnUnmappableChar = true)]
-        internal class PatchOptionData
-        {
-            public PatchSymbolFlags symbolOptionFlags;                               // PATCH_SYMBOL_xxx flags
-            [MarshalAs(UnmanagedType.LPStr)] public string newFileSymbolPath;        // always ANSI, never Unicode
-            [MarshalAs(UnmanagedType.LPStr)] public string[] oldFileSymbolPathArray; // array[ OldFileCount ]
-            public uint extendedOptionFlags;
-            public PatchSymloadCallback symLoadCallback = null;
-            public IntPtr symLoadContext = IntPtr.Zero;
-            public PatchInterleaveMap[] interleaveMapArray = null;  // array[ OldFileCount ] (requires 5.2 or higher applyer)
-            public uint maxLzxWindowSize = 0;                       // limit memory requirements (requires 5.2 or higher applyer)
-        }
-
-        //
-        // Note that PATCH_OPTION_DATA contains LPCSTR paths, and no LPCWSTR (Unicode)
-        // path argument is available, even when used with one of the Unicode APIs
-        // such as CreatePatchFileW. This is because the unlerlying system services
-        // for symbol file handling (IMAGEHLP.DLL) only support ANSI file/path names.
-        //
-
-        //
-        // A note about PATCH_RETAIN_RANGE specifiers with multiple old files:
-        //
-        // Each old version file must have the same RetainRangeCount, and the same
-        // retain range LengthInBytes and OffsetInNewFile values in the same order.
-        // Only the OffsetInOldFile values can differ between old foles for retain
-        // ranges.
-        //
-
-        //
-        // The following prototypes are (some of the) interfaces for creating patches from files.
-        //
-
-        /// <summary>
-        /// Creates a new delta.
-        /// </summary>
-        /// <param name="oldFileCount">Size of oldFileInfoArray.</param>
-        /// <param name="oldFileInfoArray">Target file information.</param>
-        /// <param name="newFileName">Name of updated file.</param>
-        /// <param name="patchFileName">Name of delta to create.</param>
-        /// <param name="optionFlags">PATCH_OPTION_xxx.</param>
-        /// <param name="optionData">Optional PATCH_OPTION_DATA structure.</param>
-        /// <param name="progressCallback">Delegate for progress callbacks.</param>
-        /// <param name="context">Context for progress callback delegate.</param>
-        /// <returns>true if successfull, sets Marshal.GetLastWin32Error() if not.</returns>
-        [DllImport("mspatchc.dll", SetLastError = true, CharSet = CharSet.Unicode, ExactSpelling = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool CreatePatchFileExW(
-                uint oldFileCount,      // maximum 255
-                [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(PatchAPIMarshaler), MarshalCookie="PATCH_OLD_FILE_INFO_W")]
-                PatchOldFileInfoW[] oldFileInfoArray,
-                string newFileName,     // input file  (required)
-                string patchFileName,   // output file (required)
-                uint optionFlags,
-                [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(PatchAPIMarshaler), MarshalCookie="PATCH_OPTION_DATA")]
-                PatchOptionData optionData,
-                [MarshalAs (UnmanagedType.FunctionPtr)]
-                PatchProgressCallback progressCallback,
-                IntPtr context
-                );
-
-        /// <summary>
-        /// Extracts delta header from delta.
-        /// </summary>
-        /// <param name="patchFileName">Name of delta file.</param>
-        /// <param name="patchHeaderFileName">Name of file to create with delta header.</param>
-        /// <returns>true if successfull, sets Marshal.GetLastWin32Error() if not.</returns>
-        [DllImport("mspatchc.dll", SetLastError = true, CharSet = CharSet.Unicode, ExactSpelling = true)]
-        [return: MarshalAs(UnmanagedType.Bool)]
-        internal static extern bool ExtractPatchHeaderToFileW(
-                string patchFileName,      // input file
-                string patchHeaderFileName // output file
-                );
-
-        // TODO: Add rest of APIs to enable custom binders to perform more exhaustive checks
-
-        /// <summary>
-        /// Marshals arguments for the CreatePatch~ APIs
-        /// </summary>
-        [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
-        internal class PatchAPIMarshaler : ICustomMarshaler
-        {
-            internal static ICustomMarshaler GetInstance(string cookie)
-            {
-                return new PatchAPIMarshaler(cookie);
-            }
-
-            private enum MarshalType
-            {
-                PATCH_OPTION_DATA,
-                PATCH_OLD_FILE_INFO_W
-            };
-            private PatchAPIMarshaler.MarshalType marshalType;
-
-            private PatchAPIMarshaler(string cookie)
-            {
-                this.marshalType = (PatchAPIMarshaler.MarshalType)Enum.Parse(typeof(PatchAPIMarshaler.MarshalType), cookie);
-            }
-
-            //
-            // Summary:
-            //     Returns the size of the native data to be marshaled.
-            //
-            // Returns:
-            //     The size in bytes of the native data.
-            public int GetNativeDataSize()
-            {
-                return Marshal.SizeOf(typeof(IntPtr));
-            }
-
-            //
-            // Summary:
-            //     Performs necessary cleanup of the managed data when it is no longer needed.
-            //
-            // Parameters:
-            //     ManagedObj:
-            //       The managed object to be destroyed.
-            public void CleanUpManagedData(object ManagedObj)
-            {
-            }
-
-            //
-            // Summary:
-            //     Performs necessary cleanup of the unmanaged data when it is no longer needed.
-            //
-            // Parameters:
-            //     pNativeData:
-            //       A pointer to the unmanaged data to be destroyed.
-            public void CleanUpNativeData(IntPtr pNativeData)
-            {
-                if (IntPtr.Zero == pNativeData)
-                {
-                    return;
-                }
-
-                switch (this.marshalType)
-                {
-                    case PatchAPIMarshaler.MarshalType.PATCH_OPTION_DATA:
-                        this.CleanUpPOD(pNativeData);
-                        break;
-                    default:
-                        this.CleanUpPOFI_A(pNativeData);
-                        break;
-                }
-            }
-
-            //
-            // Summary:
-            //     Converts the managed data to unmanaged data.
-            //
-            // Parameters:
-            //     ManagedObj:
-            //       The managed object to be converted.
-            //
-            // Returns:
-            //     Returns the COM view of the managed object.
-            public IntPtr MarshalManagedToNative(object ManagedObj)
-            {
-                if (null == ManagedObj)
-                {
-                    return IntPtr.Zero;
-                }
-
-                switch (this.marshalType)
-                {
-                    case PatchAPIMarshaler.MarshalType.PATCH_OPTION_DATA:
-                        return this.MarshalPOD(ManagedObj as PatchOptionData);
-                    case PatchAPIMarshaler.MarshalType.PATCH_OLD_FILE_INFO_W:
-                        return this.MarshalPOFIW_A(ManagedObj as PatchOldFileInfoW[]);
-                    default:
-                        throw new InvalidOperationException();
-                }
-            }
-
-
-            //
-            // Summary:
-            //     Converts the unmanaged data to managed data.
-            //
-            // Parameters:
-            //     pNativeData:
-            //       A pointer to the unmanaged data to be wrapped.
-            //
-            // Returns:
-            //     Returns the managed view of the COM data.
-            public object MarshalNativeToManaged(IntPtr pNativeData)
-            {
-                return null;
-            }
-
-            // Implementation *************************************************
-
-            // PATCH_OPTION_DATA offsets
-            private static readonly int symbolOptionFlagsOffset = Marshal.SizeOf(typeof(Int32));
-            private static readonly int newFileSymbolPathOffset = 2 * Marshal.SizeOf(typeof(Int32));
-            private static readonly int oldFileSymbolPathArrayOffset = 2 * Marshal.SizeOf(typeof(Int32)) + Marshal.SizeOf(typeof(IntPtr));
-            private static readonly int extendedOptionFlagsOffset = 2 * Marshal.SizeOf(typeof(Int32)) + 2 * Marshal.SizeOf(typeof(IntPtr));
-            private static readonly int symLoadCallbackOffset = 3 * Marshal.SizeOf(typeof(Int32)) + 2 * Marshal.SizeOf(typeof(IntPtr));
-            private static readonly int symLoadContextOffset = 3 * Marshal.SizeOf(typeof(Int32)) + 3 * Marshal.SizeOf(typeof(IntPtr));
-            private static readonly int interleaveMapArrayOffset = 3 * Marshal.SizeOf(typeof(Int32)) + 4 * Marshal.SizeOf(typeof(IntPtr));
-            private static readonly int maxLzxWindowSizeOffset = 3 * Marshal.SizeOf(typeof(Int32)) + 5 * Marshal.SizeOf(typeof(IntPtr));
-            private static readonly int patchOptionDataSize = 4 * Marshal.SizeOf(typeof(Int32)) + 5 * Marshal.SizeOf(typeof(IntPtr));
-
-            // PATCH_OLD_FILE_INFO offsets
-            private static readonly int oldFileOffset = Marshal.SizeOf(typeof(Int32));
-            private static readonly int ignoreRangeCountOffset = Marshal.SizeOf(typeof(Int32)) + Marshal.SizeOf(typeof(IntPtr));
-            private static readonly int ignoreRangeArrayOffset = 2 * Marshal.SizeOf(typeof(Int32)) + Marshal.SizeOf(typeof(IntPtr));
-            private static readonly int retainRangeCountOffset = 2 * Marshal.SizeOf(typeof(Int32)) + 2 * Marshal.SizeOf(typeof(IntPtr));
-            private static readonly int retainRangeArrayOffset = 3 * Marshal.SizeOf(typeof(Int32)) + 2 * Marshal.SizeOf(typeof(IntPtr));
-            private static readonly int patchOldFileInfoSize = 3 * Marshal.SizeOf(typeof(Int32)) + 3 * Marshal.SizeOf(typeof(IntPtr));
-
-            // Methods and data used to preserve data needed for cleanup
-
-            // This dictionary holds the quantity of items internal to each native structure that will need to be freed (the OldFileCount)
-            private static readonly Dictionary<IntPtr, int> OldFileCounts = new Dictionary<IntPtr, int>();
-            private static readonly object OldFileCountsLock = new object();
-
-            private IntPtr CreateMainStruct(int oldFileCount)
-            {
-                int nativeSize;
-                switch (this.marshalType)
-                {
-                    case PatchAPIMarshaler.MarshalType.PATCH_OPTION_DATA:
-                        nativeSize = patchOptionDataSize;
-                        break;
-                    case PatchAPIMarshaler.MarshalType.PATCH_OLD_FILE_INFO_W:
-                        nativeSize = oldFileCount * patchOldFileInfoSize;
-                        break;
-                    default:
-                        throw new InvalidOperationException();
-                }
-
-                IntPtr native = Marshal.AllocCoTaskMem(nativeSize);
-
-                lock (PatchAPIMarshaler.OldFileCountsLock)
-                {
-                    PatchAPIMarshaler.OldFileCounts.Add(native, oldFileCount);
-                }
-
-                return native;
-            }
-
-            private static void ReleaseMainStruct(IntPtr native)
-            {
-                lock (PatchAPIMarshaler.OldFileCountsLock)
-                {
-                    PatchAPIMarshaler.OldFileCounts.Remove(native);
-                }
-                Marshal.FreeCoTaskMem(native);
-            }
-
-            private static int GetOldFileCount(IntPtr native)
-            {
-                lock (PatchAPIMarshaler.OldFileCountsLock)
-                {
-                    return PatchAPIMarshaler.OldFileCounts[native];
-                }
-            }
-
-            // Helper methods
-
-            private static IntPtr OptionalAnsiString(string managed)
-            {
-                return (null == managed) ? IntPtr.Zero : Marshal.StringToCoTaskMemAnsi(managed);
-            }
-
-            private static IntPtr OptionalUnicodeString(string managed)
-            {
-                return (null == managed) ? IntPtr.Zero : Marshal.StringToCoTaskMemUni(managed);
-            }
-
-            // string array must be of the same length as the number of old files
-            private static IntPtr CreateArrayOfStringA(string[] managed)
-            {
-                if (null == managed)
-                {
-                    return IntPtr.Zero;
-                }
-
-                int size = managed.Length * Marshal.SizeOf(typeof(IntPtr));
-                IntPtr native = Marshal.AllocCoTaskMem(size);
-
-                for (int i = 0; i < managed.Length; ++i)
-                {
-                    Marshal.WriteIntPtr(native, i * Marshal.SizeOf(typeof(IntPtr)), OptionalAnsiString(managed[i]));
-                }
-
-                return native;
-            }
-
-            // string array must be of the same length as the number of old files
-            private static IntPtr CreateArrayOfStringW(string[] managed)
-            {
-                if (null == managed)
-                {
-                    return IntPtr.Zero;
-                }
-
-                int size = managed.Length * Marshal.SizeOf(typeof(IntPtr));
-                IntPtr native = Marshal.AllocCoTaskMem(size);
-
-                for (int i = 0; i < managed.Length; ++i)
-                {
-                    Marshal.WriteIntPtr(native, i * Marshal.SizeOf(typeof(IntPtr)), OptionalUnicodeString(managed[i]));
-                }
-
-                return native;
-            }
-
-            private static IntPtr CreateInterleaveMapRange(PatchInterleaveMap managed)
-            {
-                if (null == managed)
-                {
-                    return IntPtr.Zero;
-                }
-
-                if (null == managed.ranges)
-                {
-                    return IntPtr.Zero;
-                }
-
-                if (0 == managed.ranges.Length)
-                {
-                    return IntPtr.Zero;
-                }
-
-                IntPtr native = Marshal.AllocCoTaskMem(Marshal.SizeOf(typeof(UInt32))
-                                        + managed.ranges.Length * (Marshal.SizeOf(typeof(PatchInterleaveMap))));
-                WriteUInt32(native, (uint)managed.ranges.Length);
-
-                for (int i = 0; i < managed.ranges.Length; ++i)
-                {
-                    Marshal.StructureToPtr(managed.ranges[i], (IntPtr)((Int64)native + i * Marshal.SizeOf(typeof(PatchInterleaveMap))), false);
-                }
-                return native;
-            }
-
-            private static IntPtr CreateInterleaveMap(PatchInterleaveMap[] managed)
-            {
-                if (null == managed)
-                {
-                    return IntPtr.Zero;
-                }
-
-                IntPtr native = Marshal.AllocCoTaskMem(managed.Length * Marshal.SizeOf(typeof(IntPtr)));
-
-                for (int i = 0; i < managed.Length; ++i)
-                {
-                    Marshal.WriteIntPtr(native, i * Marshal.SizeOf(typeof(IntPtr)), CreateInterleaveMapRange(managed[i]));
-                }
-
-                return native;
-            }
-
-            private static void WriteUInt32(IntPtr native, uint data)
-            {
-                Marshal.WriteInt32(native, unchecked((int)data));
-            }
-
-            private static void WriteUInt32(IntPtr native, int offset, uint data)
-            {
-                Marshal.WriteInt32(native, offset, unchecked((int)data));
-            }
-
-            // Marshal operations
-
-            private IntPtr MarshalPOD(PatchOptionData managed)
-            {
-                if (null == managed)
-                {
-                    throw new ArgumentNullException("managed");
-                }
-
-                IntPtr native = this.CreateMainStruct(managed.oldFileSymbolPathArray.Length);
-                Marshal.WriteInt32(native, patchOptionDataSize); // SizeOfThisStruct
-                WriteUInt32(native, symbolOptionFlagsOffset, (uint)managed.symbolOptionFlags);
-                Marshal.WriteIntPtr(native, newFileSymbolPathOffset, PatchAPIMarshaler.OptionalAnsiString(managed.newFileSymbolPath));
-                Marshal.WriteIntPtr(native, oldFileSymbolPathArrayOffset, PatchAPIMarshaler.CreateArrayOfStringA(managed.oldFileSymbolPathArray));
-                WriteUInt32(native, extendedOptionFlagsOffset, managed.extendedOptionFlags);
-
-                // GetFunctionPointerForDelegate() throws an ArgumentNullException if the delegate is null.
-                if (null == managed.symLoadCallback)
-                {
-                    Marshal.WriteIntPtr(native, symLoadCallbackOffset, IntPtr.Zero);
-                }
-                else
-                {
-                    Marshal.WriteIntPtr(native, symLoadCallbackOffset, Marshal.GetFunctionPointerForDelegate(managed.symLoadCallback));
-                }
-
-                Marshal.WriteIntPtr(native, symLoadContextOffset, managed.symLoadContext);
-                Marshal.WriteIntPtr(native, interleaveMapArrayOffset, PatchAPIMarshaler.CreateInterleaveMap(managed.interleaveMapArray));
-                WriteUInt32(native, maxLzxWindowSizeOffset, managed.maxLzxWindowSize);
-                return native;
-            }
-
-            private IntPtr MarshalPOFIW_A(PatchOldFileInfoW[] managed)
-            {
-                if (null == managed)
-                {
-                    throw new ArgumentNullException("managed");
-                }
-
-                if (0 == managed.Length)
-                {
-                    return IntPtr.Zero;
-                }
-
-                IntPtr native = this.CreateMainStruct(managed.Length);
-
-                for (int i = 0; i < managed.Length; ++i)
-                {
-                    PatchAPIMarshaler.MarshalPOFIW(managed[i], (IntPtr)((Int64)native + i * patchOldFileInfoSize));
-                }
-
-                return native;
-            }
-
-            private static void MarshalPOFIW(PatchOldFileInfoW managed, IntPtr native)
-            {
-                PatchAPIMarshaler.MarshalPOFI(managed, native);
-                Marshal.WriteIntPtr(native, oldFileOffset, PatchAPIMarshaler.OptionalUnicodeString(managed.oldFileName)); // OldFileName
-            }
-
-            private static void MarshalPOFI(PatchOldFileInfo managed, IntPtr native)
-            {
-                Marshal.WriteInt32(native, patchOldFileInfoSize); // SizeOfThisStruct
-                WriteUInt32(native, ignoreRangeCountOffset,
-                                    (null == managed.ignoreRange) ? 0 : (uint)managed.ignoreRange.Length); // IgnoreRangeCount // maximum 255
-                Marshal.WriteIntPtr(native, ignoreRangeArrayOffset, MarshalPIRArray(managed.ignoreRange));  // IgnoreRangeArray
-                WriteUInt32(native, retainRangeCountOffset,
-                                    (null == managed.retainRange) ? 0 : (uint)managed.retainRange.Length); // RetainRangeCount // maximum 255
-                Marshal.WriteIntPtr(native, retainRangeArrayOffset, MarshalPRRArray(managed.retainRange));  // RetainRangeArray
-            }
-
-            private static IntPtr MarshalPIRArray(PatchIgnoreRange[] array)
-            {
-                if (null == array)
-                {
-                    return IntPtr.Zero;
-                }
-
-                if (0 == array.Length)
-                {
-                    return IntPtr.Zero;
-                }
-
-                IntPtr native = Marshal.AllocCoTaskMem(array.Length * Marshal.SizeOf(typeof(PatchIgnoreRange)));
-
-                for (int i = 0; i < array.Length; ++i)
-                {
-                    Marshal.StructureToPtr(array[i], (IntPtr)((Int64)native + (i * Marshal.SizeOf(typeof(PatchIgnoreRange)))), false);
-                }
-
-                return native;
-            }
-
-            private static IntPtr MarshalPRRArray(PatchRetainRange[] array)
-            {
-                if (null == array)
-                {
-                    return IntPtr.Zero;
-                }
-
-                if (0 == array.Length)
-                {
-                    return IntPtr.Zero;
-                }
-
-                IntPtr native = Marshal.AllocCoTaskMem(array.Length * Marshal.SizeOf(typeof(PatchRetainRange)));
-
-                for (int i = 0; i < array.Length; ++i)
-                {
-                    Marshal.StructureToPtr(array[i], (IntPtr)((Int64)native + (i * Marshal.SizeOf(typeof(PatchRetainRange)))), false);
-                }
-
-                return native;
-            }
-
-            // CleanUp operations
-
-            private void CleanUpPOD(IntPtr native)
-            {
-                Marshal.FreeCoTaskMem(Marshal.ReadIntPtr(native, newFileSymbolPathOffset));
-
-                if (IntPtr.Zero != Marshal.ReadIntPtr(native, oldFileSymbolPathArrayOffset))
-                {
-                    for (int i = 0; i < GetOldFileCount(native); ++i)
-                    {
-                        Marshal.FreeCoTaskMem(
-                                Marshal.ReadIntPtr(
-                                        Marshal.ReadIntPtr(native, oldFileSymbolPathArrayOffset),
-                                        i * Marshal.SizeOf(typeof(IntPtr))));
-                    }
-
-                    Marshal.FreeCoTaskMem(Marshal.ReadIntPtr(native, oldFileSymbolPathArrayOffset));
-                }
-
-                if (IntPtr.Zero != Marshal.ReadIntPtr(native, interleaveMapArrayOffset))
-                {
-                    for (int i = 0; i < GetOldFileCount(native); ++i)
-                    {
-                        Marshal.FreeCoTaskMem(
-                                Marshal.ReadIntPtr(
-                                        Marshal.ReadIntPtr(native, interleaveMapArrayOffset),
-                                        i * Marshal.SizeOf(typeof(IntPtr))));
-                    }
-
-                    Marshal.FreeCoTaskMem(Marshal.ReadIntPtr(native, interleaveMapArrayOffset));
-                }
-
-                PatchAPIMarshaler.ReleaseMainStruct(native);
-            }
-
-            private void CleanUpPOFI_A(IntPtr native)
-            {
-                for (int i = 0; i < GetOldFileCount(native); ++i)
-                {
-                    PatchAPIMarshaler.CleanUpPOFI((IntPtr)((Int64)native + i * patchOldFileInfoSize));
-                }
-
-                PatchAPIMarshaler.ReleaseMainStruct(native);
-            }
-
-            private static void CleanUpPOFI(IntPtr native)
-            {
-                if (IntPtr.Zero != Marshal.ReadIntPtr(native, oldFileOffset))
-                {
-                    Marshal.FreeCoTaskMem(Marshal.ReadIntPtr(native, oldFileOffset));
-                }
-
-                PatchAPIMarshaler.CleanUpPOFIH(native);
-            }
-
-            private static void CleanUpPOFIH(IntPtr native)
-            {
-                if (IntPtr.Zero != Marshal.ReadIntPtr(native, ignoreRangeArrayOffset))
-                {
-                    Marshal.FreeCoTaskMem(Marshal.ReadIntPtr(native, ignoreRangeArrayOffset));
-                }
-
-                if (IntPtr.Zero != Marshal.ReadIntPtr(native, retainRangeArrayOffset))
-                {
-                    Marshal.FreeCoTaskMem(Marshal.ReadIntPtr(native, retainRangeArrayOffset));
-                }
-            }
-        }
-    }
-}
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;
diff --git a/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs b/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs
deleted file mode 100644
index 20606a77..00000000
--- a/src/WixToolset.Core.WindowsInstaller/ValidatorExtension.cs
+++ /dev/null
@@ -1,288 +0,0 @@
-// 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.Extensibility
-{
-    using System;
-    using System.Collections;
-    using WixToolset.Data;
-    using WixToolset.Data.WindowsInstaller;
-    using WixToolset.Extensibility.Services;
-
-    /// <summary>
-    /// Base class for creating a validator extension. This default implementation
-    /// will fire and event with the ICE name and description.
-    /// </summary>
-    public class ValidatorExtension
-    {
-        private string databaseFile;
-        private Hashtable indexedSourceLineNumbers;
-        private WindowsInstallerData output;
-        private SourceLineNumber sourceLineNumbers;
-        private readonly IMessaging messaging;
-
-        /// <summary>
-        /// Instantiate a new <see cref="ValidatorExtension"/>.
-        /// </summary>
-        public ValidatorExtension(IMessaging messaging)
-        {
-            this.messaging = messaging;
-        }
-
-        /// <summary>
-        /// Gets or sets the path to the database to validate.
-        /// </summary>
-        /// <value>The path to the database to validate.</value>
-        public string DatabaseFile
-        {
-            get { return this.databaseFile; }
-            set { this.databaseFile = value; }
-        }
-
-        /// <summary>
-        /// Gets or sets the <see cref="Output"/> for finding source line information.
-        /// </summary>
-        /// <value>The <see cref="Output"/> for finding source line information.</value>
-        public WindowsInstallerData Output
-        {
-            get { return this.output; }
-            set { this.output = value; }
-        }
-
-        /// <summary>
-        /// Called at the beginning of the validation of a database file.
-        /// </summary>
-        /// <remarks>
-        /// <para>The Validator will set
-        /// <see cref="DatabaseFile"/> before calling InitializeValidator.</para>
-        /// <para><b>Notes to Inheritors:</b> When overriding
-        /// <b>InitializeValidator</b> in a derived class, be sure to call
-        /// the base class's <b>InitializeValidator</b> to thoroughly
-        /// initialize the extension.</para>
-        /// </remarks>
-        public virtual void InitializeValidator()
-        {
-            if (this.databaseFile != null)
-            {
-                this.sourceLineNumbers = new SourceLineNumber(this.databaseFile);
-            }
-        }
-
-        /// <summary>
-        /// Called at the end of the validation of a database file.
-        /// </summary>
-        /// <remarks>
-        /// <para>The default implementation will nullify source lines.</para>
-        /// <para><b>Notes to Inheritors:</b> When overriding
-        /// <b>FinalizeValidator</b> in a derived class, be sure to call
-        /// the base class's <b>FinalizeValidator</b> to thoroughly
-        /// finalize the extension.</para>
-        /// </remarks>
-        public virtual void FinalizeValidator()
-        {
-            this.sourceLineNumbers = null;
-        }
-
-        /// <summary>
-        /// Logs a message from the Validator.
-        /// </summary>
-        /// <param name="message">A <see cref="String"/> of tab-delmited tokens
-        /// in the validation message.</param>
-        public virtual void Log(string message)
-        {
-            this.Log(message, null);
-        }
-
-        /// <summary>
-        /// Logs a message from the Validator.
-        /// </summary>
-        /// <param name="message">A <see cref="String"/> of tab-delmited tokens
-        /// in the validation message.</param>
-        /// <param name="action">The name of the action to which the message
-        /// belongs.</param>
-        /// <exception cref="ArgumentNullException">The message cannot be null.
-        /// </exception>
-        /// <exception cref="WixException">The message does not contain four (4)
-        /// or more tab-delimited tokens.</exception>
-        /// <remarks>
-        /// <para><paramref name="message"/> a tab-delimited set of tokens,
-        /// formatted according to Windows Installer guidelines for ICE
-        /// message. The following table lists what each token by index
-        /// should mean.</para>
-        /// <para><paramref name="action"/> a name that represents the ICE
-        /// action that was executed (e.g. 'ICE08').</para>
-        /// <list type="table">
-        /// <listheader>
-        ///     <term>Index</term>
-        ///     <description>Description</description>
-        /// </listheader>
-        /// <item>
-        ///     <term>0</term>
-        ///     <description>Name of the ICE.</description>
-        /// </item>
-        /// <item>
-        ///     <term>1</term>
-        ///     <description>Message type. See the following list.</description>
-        /// </item>
-        /// <item>
-        ///     <term>2</term>
-        ///     <description>Detailed description.</description>
-        /// </item>
-        /// <item>
-        ///     <term>3</term>
-        ///     <description>Help URL or location.</description>
-        /// </item>
-        /// <item>
-        ///     <term>4</term>
-        ///     <description>Table name.</description>
-        /// </item>
-        /// <item>
-        ///     <term>5</term>
-        ///     <description>Column name.</description>
-        /// </item>
-        /// <item>
-        ///     <term>6</term>
-        ///     <description>This and remaining fields are primary keys
-        ///     to identify a row.</description>
-        /// </item>
-        /// </list>
-        /// <para>The message types are one of the following value.</para>
-        /// <list type="table">
-        /// <listheader>
-        ///     <term>Value</term>
-        ///     <description>Message Type</description>
-        /// </listheader>
-        /// <item>
-        ///     <term>0</term>
-        ///     <description>Failure message reporting the failure of the
-        ///     ICE custom action.</description>
-        /// </item>
-        /// <item>
-        ///     <term>1</term>
-        ///     <description>Error message reporting database authoring that
-        ///     case incorrect behavior.</description>
-        /// </item>
-        /// <item>
-        ///     <term>2</term>
-        ///     <description>Warning message reporting database authoring that
-        ///     causes incorrect behavior in certain cases. Warnings can also
-        ///     report unexpected side-effects of database authoring.
-        ///     </description>
-        /// </item>
-        /// <item>
-        ///     <term>3</term>
-        ///     <description>Informational message.</description>
-        /// </item>
-        /// </list>
-        /// </remarks>
-        public virtual void Log(string message, string action)
-        {
-            if (message == null)
-            {
-                throw new ArgumentNullException("message");
-            }
-
-            var messageParts = message.Split('\t');
-            if (3 > messageParts.Length)
-            {
-                if (null == action)
-                {
-                    throw new WixException(ErrorMessages.UnexpectedExternalUIMessage(message));
-                }
-                else
-                {
-                    throw new WixException(ErrorMessages.UnexpectedExternalUIMessage(message, action));
-                }
-            }
-
-            SourceLineNumber messageSourceLineNumbers;
-            if (6 < messageParts.Length)
-            {
-                var primaryKeys = new string[messageParts.Length - 6];
-
-                Array.Copy(messageParts, 6, primaryKeys, 0, primaryKeys.Length);
-
-                messageSourceLineNumbers = this.GetSourceLineNumbers(messageParts[4], primaryKeys);
-            }
-            else // use the file name as the source line information
-            {
-                messageSourceLineNumbers = this.sourceLineNumbers;
-            }
-
-            switch (messageParts[1])
-            {
-                case "0":
-                case "1":
-                    this.messaging.Write(ErrorMessages.ValidationError(messageSourceLineNumbers, messageParts[0], messageParts[2]));
-                    break;
-                case "2":
-                    this.messaging.Write(WarningMessages.ValidationWarning(messageSourceLineNumbers, messageParts[0], messageParts[2]));
-                    break;
-                case "3":
-                    this.messaging.Write(VerboseMessages.ValidationInfo(messageParts[0], messageParts[2]));
-                    break;
-                default:
-                    throw new WixException(ErrorMessages.InvalidValidatorMessageType(messageParts[1]));
-            }
-        }
- 
-        /// <summary>
-        /// Gets the source line information (if available) for a row by its table name and primary key.
-        /// </summary>
-        /// <param name="tableName">The table name of the row.</param>
-        /// <param name="primaryKeys">The primary keys of the row.</param>
-        /// <returns>The source line number information if found; null otherwise.</returns>
-        protected SourceLineNumber GetSourceLineNumbers(string tableName, string[] primaryKeys)
-        {
-            // source line information only exists if an output file was supplied
-            if (null != this.output)
-            {
-                // index the source line information if it hasn't been indexed already
-                if (null == this.indexedSourceLineNumbers)
-                {
-                    this.indexedSourceLineNumbers = new Hashtable();
-
-                    // index each real table
-                    foreach (var table in this.output.Tables)
-                    {
-                        // skip unreal tables
-                        if (table.Definition.Unreal)
-                        {
-                            continue;
-                        }
-
-                        // index each row
-                        foreach (var row in table.Rows)
-                        {
-                            // skip rows that don't contain source line information
-                            if (null == row.SourceLineNumbers)
-                            {
-                                continue;
-                            }
-
-                            // index the row using its table name and primary key
-                            var primaryKey = row.GetPrimaryKey(';');
-                            if (null != primaryKey)
-                            {
-                                var key = String.Concat(table.Name, ":", primaryKey);
-
-                                if (this.indexedSourceLineNumbers.ContainsKey(key))
-                                {
-                                    this.messaging.Write(WarningMessages.DuplicatePrimaryKey(row.SourceLineNumbers, primaryKey, table.Name));
-                                }
-                                else
-                                {
-                                    this.indexedSourceLineNumbers.Add(key, row.SourceLineNumbers);
-                                }
-                            }
-                        }
-                    }
-                }
-
-                return (SourceLineNumber)this.indexedSourceLineNumbers[String.Concat(tableName, ":", String.Join(";", primaryKeys))];
-            }
-
-            // use the file name as the source line information
-            return this.sourceLineNumbers;
-        }
-   }
-}
diff --git a/src/WixToolset.Core/Bind/FileSystem.cs b/src/WixToolset.Core/Bind/FileSystem.cs
deleted file mode 100644
index bdd65503..00000000
--- a/src/WixToolset.Core/Bind/FileSystem.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-// 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.Core.Bind
-{
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Runtime.InteropServices;
-    using WixToolset.Extensibility;
-
-    internal class FileSystem
-    {
-        public FileSystem(IEnumerable<ILayoutExtension> extensions)
-        {
-            this.Extensions = extensions ?? Array.Empty<ILayoutExtension>();
-        }
-
-        private IEnumerable<ILayoutExtension> Extensions { get; }
-
-        /// <summary>
-        /// Copies a file.
-        /// </summary>
-        /// <param name="source">The file to copy.</param>
-        /// <param name="destination">The destination file.</param>
-        public bool CopyFile(string source, string destination)
-        {
-            foreach (var extension in this.Extensions)
-            {
-                if (extension.CopyFile(source, destination))
-                {
-                    return true;
-                }
-            }
-
-            if (File.Exists(destination))
-            {
-                File.Delete(destination);
-            }
-
-            if (!CreateHardLink(destination, source, IntPtr.Zero))
-            {
-#if DEBUG
-                int er = Marshal.GetLastWin32Error();
-#endif
-
-                File.Copy(source, destination, true);
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Moves a file.
-        /// </summary>
-        /// <param name="source">The file to move.</param>
-        /// <param name="destination">The destination file.</param>
-        public bool MoveFile(string source, string destination)
-        {
-            foreach (var extension in this.Extensions)
-            {
-                if (extension.MoveFile(source, destination))
-                {
-                    return true;
-                }
-            }
-
-            if (File.Exists(destination))
-            {
-                File.Delete(destination);
-            }
-
-            var directory = Path.GetDirectoryName(destination);
-            if (!String.IsNullOrEmpty(directory))
-            {
-                Directory.CreateDirectory(directory);
-            }
-
-            File.Move(source, destination);
-
-            return true;
-        }
-
-        [DllImport("Kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
-        private static extern bool CreateHardLink(string lpFileName, string lpExistingFileName, IntPtr lpSecurityAttributes);
-    }
-}
diff --git a/src/WixToolset.Core/Bind/TransferFilesCommand.cs b/src/WixToolset.Core/Bind/TransferFilesCommand.cs
index b9c54a14..9c104187 100644
--- a/src/WixToolset.Core/Bind/TransferFilesCommand.cs
+++ b/src/WixToolset.Core/Bind/TransferFilesCommand.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Core.Bind
     using System.Collections.Generic;
     using System.IO;
     using System.Security.AccessControl;
+    using WixToolset.Core.Native;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
@@ -15,23 +16,23 @@ namespace WixToolset.Core.Bind
     {
         public TransferFilesCommand(IMessaging messaging, IEnumerable<ILayoutExtension> extensions, IEnumerable<IFileTransfer> fileTransfers, bool suppressAclReset)
         {
-            this.FileSystem = new FileSystem(extensions);
+            this.Extensions = extensions;
             this.Messaging = messaging;
             this.FileTransfers = fileTransfers;
             this.SuppressAclReset = suppressAclReset;
         }
 
-        private FileSystem FileSystem { get; }
-
         private IMessaging Messaging { get; }
 
+        private IEnumerable<ILayoutExtension> Extensions { get; }
+
         private IEnumerable<IFileTransfer> FileTransfers { get; }
 
         private bool SuppressAclReset { get; }
 
         public void Execute()
         {
-            List<string> destinationFiles = new List<string>();
+            var destinationFiles = new List<string>();
 
             foreach (var fileTransfer in this.FileTransfers)
             {
@@ -42,7 +43,7 @@ namespace WixToolset.Core.Bind
                     continue;
                 }
 
-                bool retry = false;
+                var retry = false;
                 do
                 {
                     try
@@ -50,12 +51,12 @@ namespace WixToolset.Core.Bind
                         if (fileTransfer.Move)
                         {
                             this.Messaging.Write(VerboseMessages.MoveFile(fileTransfer.Source, fileTransfer.Destination));
-                            this.TransferFile(true, fileTransfer.Source, fileTransfer.Destination);
+                            this.MoveFile(fileTransfer.Source, fileTransfer.Destination);
                         }
                         else
                         {
                             this.Messaging.Write(VerboseMessages.CopyFile(fileTransfer.Source, fileTransfer.Destination));
-                            this.TransferFile(false, fileTransfer.Source, fileTransfer.Destination);
+                            this.CopyFile(fileTransfer.Source, fileTransfer.Destination);
                         }
 
                         retry = false;
@@ -73,7 +74,7 @@ namespace WixToolset.Core.Bind
                             throw;
                         }
 
-                        string directory = Path.GetDirectoryName(fileTransfer.Destination);
+                        var directory = Path.GetDirectoryName(fileTransfer.Destination);
                         this.Messaging.Write(VerboseMessages.CreateDirectory(directory));
                         Directory.CreateDirectory(directory);
                         retry = true;
@@ -91,7 +92,7 @@ namespace WixToolset.Core.Bind
                             this.Messaging.Write(VerboseMessages.RemoveDestinationFile(fileTransfer.Destination));
 
                             // try to ensure the file is not read-only
-                            FileAttributes attributes = File.GetAttributes(fileTransfer.Destination);
+                            var attributes = File.GetAttributes(fileTransfer.Destination);
                             try
                             {
                                 File.SetAttributes(fileTransfer.Destination, attributes & ~FileAttributes.ReadOnly);
@@ -131,7 +132,7 @@ namespace WixToolset.Core.Bind
                             this.Messaging.Write(VerboseMessages.RemoveDestinationFile(fileTransfer.Destination));
 
                             // ensure the file is not read-only, then delete it
-                            FileAttributes attributes = File.GetAttributes(fileTransfer.Destination);
+                            var attributes = File.GetAttributes(fileTransfer.Destination);
                             File.SetAttributes(fileTransfer.Destination, attributes & ~FileAttributes.ReadOnly);
                             try
                             {
@@ -161,8 +162,6 @@ namespace WixToolset.Core.Bind
 
                 try
                 {
-                    //WixToolset.Core.Native.NativeMethods.ResetAcls(destinationFiles.ToArray(), (uint)destinationFiles.Count);
-
                     foreach (var file in destinationFiles)
                     {
                         new FileInfo(file).SetAccessControl(aclReset);
@@ -175,23 +174,30 @@ namespace WixToolset.Core.Bind
             }
         }
 
-        private void TransferFile(bool move, string source, string destination)
+        private void CopyFile(string source, string destination)
         {
-            bool complete = false;
-
-            if (move)
+            foreach (var extension in this.Extensions)
             {
-                complete = this.FileSystem.MoveFile(source, destination);
-            }
-            else
-            {
-                complete = this.FileSystem.CopyFile(source, destination);
+                if (extension.CopyFile(source, destination))
+                {
+                    return;
+                }
             }
 
-            if (!complete)
+            FileSystem.CopyFile(source, destination, allowHardlink: true);
+        }
+
+        private void MoveFile(string source, string destination)
+        {
+            foreach (var extension in this.Extensions)
             {
-                throw new InvalidOperationException(); // TODO: something needs to be said here that none of the binder file managers returned a result.
+                if (extension.MoveFile(source, destination))
+                {
+                    return;
+                }
             }
+
+            FileSystem.MoveFile(source, destination);
         }
     }
 }
diff --git a/src/WixToolset.Core/Inscriber.cs b/src/WixToolset.Core/Inscriber.cs
deleted file mode 100644
index cff2dab2..00000000
--- a/src/WixToolset.Core/Inscriber.cs
+++ /dev/null
@@ -1,437 +0,0 @@
-// 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.Core
-{
-    using System.IO;
-    using WixToolset.Data;
-
-    /// <summary>
-    /// Converts a wixout representation of an MSM database into a ComponentGroup the form of WiX source.
-    /// </summary>
-    internal class Inscriber
-    {
-        // <summary>
-        // Gets or sets the temp files collection.
-        // </summary>
-        // <value>The temp files collection.</value>
-        // public TempFileCollection TempFiles
-        // {
-        //     get { return this.tempFiles; }
-        //     set { this.tempFiles = value; }
-        // }
-
-        /// <summary>
-        /// Gets or sets the path to the temp files location.
-        /// </summary>
-        /// <value>The path to the temp files location.</value>
-        public string TempFilesLocation
-        {
-            get
-            {
-                // if (null == this.tempFiles)
-                // {
-                //     return null;
-                // }
-                // else
-                // {
-                //     return this.tempFiles.BasePath;
-                // }
-                return Path.GetTempPath();
-            }
-        //     set
-        //     {
-        //         this.DeleteTempFiles();
-
-        //         if (null == value)
-        //         {
-        //             this.tempFiles = new TempFileCollection();
-        //         }
-        //         else
-        //         {
-        //             this.tempFiles = new TempFileCollection(value);
-        //         }
-
-        //         // ensure the base path exists
-        //         Directory.CreateDirectory(this.tempFiles.BasePath);
-        //     }
-        }
-
-        /// <summary>
-        /// Extracts engine from attached container and updates engine with detached container signatures.
-        /// </summary>
-        /// <param name="bundleFile">Bundle with attached container.</param>
-        /// <param name="outputFile">Bundle engine only.</param>
-        /// <returns>True if bundle was updated.</returns>
-        public bool InscribeBundleEngine(string bundleFile, string outputFile)
-        {
-            //string tempFile = Path.Combine(this.TempFilesLocation, "bundle_engine_unsigned.exe");
-
-            //using (BurnReader reader = BurnReader.Open(bundleFile))
-            //using (FileStream writer = File.Open(tempFile, FileMode.Create, FileAccess.Write, FileShare.Read | FileShare.Delete))
-            //{
-            //    reader.Stream.Seek(0, SeekOrigin.Begin);
-
-            //    byte[] buffer = new byte[4 * 1024];
-            //    int total = 0;
-            //    int read = 0;
-            //    do
-            //    {
-            //        read = Math.Min(buffer.Length, (int)reader.EngineSize - total);
-
-            //        read = reader.Stream.Read(buffer, 0, read);
-            //        writer.Write(buffer, 0, read);
-
-            //        total += read;
-            //    } while (total < reader.EngineSize && 0 < read);
-
-            //    if (total != reader.EngineSize)
-            //    {
-            //        throw new InvalidOperationException("Failed to copy engine out of bundle.");
-            //    }
-
-            //    // TODO: update writer with detached container signatures.
-            //}
-
-            //Directory.CreateDirectory(Path.GetDirectoryName(outputFile));
-            //if (File.Exists(outputFile))
-            //{
-            //    File.Delete(outputFile);
-            //}
-            //File.Move(tempFile, outputFile);
-            //WixToolset.Core.Native.NativeMethods.ResetAcls(new string[] { outputFile }, 1);
-
-            return true;
-        }
-
-        /// <summary>
-        /// Updates engine with attached container information and adds attached container again.
-        /// </summary>
-        /// <param name="bundleFile">Bundle with attached container.</param>
-        /// <param name="signedEngineFile">Signed bundle engine.</param>
-        /// <param name="outputFile">Signed engine with attached container.</param>
-        /// <returns>True if bundle was updated.</returns>
-        public bool InscribeBundle(string bundleFile, string signedEngineFile, string outputFile)
-        {
-            //bool inscribed = false;
-            //string tempFile = Path.Combine(this.TempFilesLocation, "bundle_engine_signed.exe");
-
-            //using (BurnReader reader = BurnReader.Open(bundleFile))
-            //{
-            //    File.Copy(signedEngineFile, tempFile, true);
-
-            //    // If there was an attached container on the original (unsigned) bundle, put it back.
-            //    if (reader.AttachedContainerSize > 0)
-            //    {
-            //        reader.Stream.Seek(reader.AttachedContainerAddress, SeekOrigin.Begin);
-
-            //        using (BurnWriter writer = BurnWriter.Open(tempFile))
-            //        {
-            //            writer.RememberThenResetSignature();
-            //            writer.AppendContainer(reader.Stream, reader.AttachedContainerSize, BurnCommon.Container.Attached);
-            //            inscribed = true;
-            //        }
-            //    }
-            //}
-
-            //Directory.CreateDirectory(Path.GetDirectoryName(outputFile));
-            //if (File.Exists(outputFile))
-            //{
-            //    File.Delete(outputFile);
-            //}
-            //File.Move(tempFile, outputFile);
-            //WixToolset.Core.Native.NativeMethods.ResetAcls(new string[] { outputFile }, 1);
-
-            //return inscribed;
-            return false;
-        }
-
-        /// <summary>
-        /// Updates database with signatures from external cabinets.
-        /// </summary>
-        /// <param name="databaseFile">Path to MSI database.</param>
-        /// <param name="outputFile">Ouput for updated MSI database.</param>
-        /// <param name="tidy">Clean up files.</param>
-        /// <returns>True if database is updated.</returns>
-        public bool InscribeDatabase(string databaseFile, string outputFile, bool tidy)
-        {
-            //// Keeps track of whether we've encountered at least one signed cab or not - we'll throw a warning if no signed cabs were encountered
-            //bool foundUnsignedExternals = false;
-            //bool shouldCommit = false;
-
-            //FileAttributes attributes = File.GetAttributes(databaseFile);
-            //if (FileAttributes.ReadOnly == (attributes & FileAttributes.ReadOnly))
-            //{
-            //    this.OnMessage(WixErrors.ReadOnlyOutputFile(databaseFile));
-            //    return shouldCommit;
-            //}
-
-            //using (Database database = new Database(databaseFile, OpenDatabase.Transact))
-            //{
-            //    // Just use the English codepage, because the tables we're importing only have binary streams / MSI identifiers / other non-localizable content
-            //    int codepage = 1252;
-
-            //    // list of certificates for this database (hash/identifier)
-            //    Dictionary<string, string> certificates = new Dictionary<string, string>();
-
-            //    // Reset the in-memory tables for this new database
-            //    Table digitalSignatureTable = new Table(null, this.tableDefinitions["MsiDigitalSignature"]);
-            //    Table digitalCertificateTable = new Table(null, this.tableDefinitions["MsiDigitalCertificate"]);
-
-            //    // If any digital signature records exist that are not of the media type, preserve them
-            //    if (database.TableExists("MsiDigitalSignature"))
-            //    {
-            //        using (View digitalSignatureView = database.OpenExecuteView("SELECT `Table`, `SignObject`, `DigitalCertificate_`, `Hash` FROM `MsiDigitalSignature` WHERE `Table` <> 'Media'"))
-            //        {
-            //            while (true)
-            //            {
-            //                using (Record digitalSignatureRecord = digitalSignatureView.Fetch())
-            //                {
-            //                    if (null == digitalSignatureRecord)
-            //                    {
-            //                        break;
-            //                    }
-
-            //                    Row digitalSignatureRow = null;
-            //                    digitalSignatureRow = digitalSignatureTable.CreateRow(null);
-
-            //                    string table = digitalSignatureRecord.GetString(0);
-            //                    string signObject = digitalSignatureRecord.GetString(1);
-
-            //                    digitalSignatureRow[0] = table;
-            //                    digitalSignatureRow[1] = signObject;
-            //                    digitalSignatureRow[2] = digitalSignatureRecord.GetString(2);
-
-            //                    if (false == digitalSignatureRecord.IsNull(3))
-            //                    {
-            //                        // Export to a file, because the MSI API's require us to provide a file path on disk
-            //                        string hashPath = Path.Combine(this.TempFilesLocation, "MsiDigitalSignature");
-            //                        string hashFileName = string.Concat(table, ".", signObject, ".bin");
-
-            //                        Directory.CreateDirectory(hashPath);
-            //                        hashPath = Path.Combine(hashPath, hashFileName);
-
-            //                        using (FileStream fs = File.Create(hashPath))
-            //                        {
-            //                            int bytesRead;
-            //                            byte[] buffer = new byte[1024 * 4];
-
-            //                            while (0 != (bytesRead = digitalSignatureRecord.GetStream(3, buffer, buffer.Length)))
-            //                            {
-            //                                fs.Write(buffer, 0, bytesRead);
-            //                            }
-            //                        }
-
-            //                        digitalSignatureRow[3] = hashFileName;
-            //                    }
-            //                }
-            //            }
-            //        }
-            //    }
-
-            //    // If any digital certificates exist, extract and preserve them
-            //    if (database.TableExists("MsiDigitalCertificate"))
-            //    {
-            //        using (View digitalCertificateView = database.OpenExecuteView("SELECT * FROM `MsiDigitalCertificate`"))
-            //        {
-            //            while (true)
-            //            {
-            //                using (Record digitalCertificateRecord = digitalCertificateView.Fetch())
-            //                {
-            //                    if (null == digitalCertificateRecord)
-            //                    {
-            //                        break;
-            //                    }
-
-            //                    string certificateId = digitalCertificateRecord.GetString(1); // get the identifier of the certificate
-
-            //                    // Export to a file, because the MSI API's require us to provide a file path on disk
-            //                    string certPath = Path.Combine(this.TempFilesLocation, "MsiDigitalCertificate");
-            //                    Directory.CreateDirectory(certPath);
-            //                    certPath = Path.Combine(certPath, string.Concat(certificateId, ".cer"));
-
-            //                    using (FileStream fs = File.Create(certPath))
-            //                    {
-            //                        int bytesRead;
-            //                        byte[] buffer = new byte[1024 * 4];
-
-            //                        while (0 != (bytesRead = digitalCertificateRecord.GetStream(2, buffer, buffer.Length)))
-            //                        {
-            //                            fs.Write(buffer, 0, bytesRead);
-            //                        }
-            //                    }
-
-            //                    // Add it to our "add to MsiDigitalCertificate" table dictionary
-            //                    Row digitalCertificateRow = digitalCertificateTable.CreateRow(null);
-            //                    digitalCertificateRow[0] = certificateId;
-
-            //                    // Now set the file path on disk where this binary stream will be picked up at import time
-            //                    digitalCertificateRow[1] = string.Concat(certificateId, ".cer");
-
-            //                    // Load the cert to get it's thumbprint
-            //                    X509Certificate cert = X509Certificate.CreateFromCertFile(certPath);
-            //                    X509Certificate2 cert2 = new X509Certificate2(cert);
-
-            //                    certificates.Add(cert2.Thumbprint, certificateId);
-            //                }
-            //            }
-            //        }
-            //    }
-
-            //    using (View mediaView = database.OpenExecuteView("SELECT * FROM `Media`"))
-            //    {
-            //        while (true)
-            //        {
-            //            using (Record mediaRecord = mediaView.Fetch())
-            //            {
-            //                if (null == mediaRecord)
-            //                {
-            //                    break;
-            //                }
-
-            //                X509Certificate2 cert2 = null;
-            //                Row digitalSignatureRow = null;
-
-            //                string cabName = mediaRecord.GetString(4); // get the name of the cab
-            //                // If there is no cabinet or it's an internal cab, skip it.
-            //                if (String.IsNullOrEmpty(cabName) || cabName.StartsWith("#", StringComparison.Ordinal))
-            //                {
-            //                    continue;
-            //                }
-
-            //                string cabId = mediaRecord.GetString(1); // get the ID of the cab
-            //                string cabPath = Path.Combine(Path.GetDirectoryName(databaseFile), cabName);
-
-            //                // If the cabs aren't there, throw an error but continue to catch the other errors
-            //                if (!File.Exists(cabPath))
-            //                {
-            //                    this.OnMessage(WixErrors.WixFileNotFound(cabPath));
-            //                    continue;
-            //                }
-
-            //                try
-            //                {
-            //                    // Get the certificate from the cab
-            //                    X509Certificate signedFileCert = X509Certificate.CreateFromSignedFile(cabPath);
-            //                    cert2 = new X509Certificate2(signedFileCert);
-            //                }
-            //                catch (System.Security.Cryptography.CryptographicException e)
-            //                {
-            //                    uint HResult = unchecked((uint)Marshal.GetHRForException(e));
-
-            //                    // If the file has no cert, continue, but flag that we found at least one so we can later give a warning
-            //                    if (0x80092009 == HResult) // CRYPT_E_NO_MATCH
-            //                    {
-            //                        foundUnsignedExternals = true;
-            //                        continue;
-            //                    }
-
-            //                    // todo: exactly which HRESULT corresponds to this issue?
-            //                    // If it's one of these exact platforms, warn the user that it may be due to their OS.
-            //                    if ((5 == Environment.OSVersion.Version.Major && 2 == Environment.OSVersion.Version.Minor) || // W2K3
-            //                            (5 == Environment.OSVersion.Version.Major && 1 == Environment.OSVersion.Version.Minor)) // XP
-            //                    {
-            //                        this.OnMessage(WixErrors.UnableToGetAuthenticodeCertOfFileDownlevelOS(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult)));
-            //                    }
-            //                    else // otherwise, generic error
-            //                    {
-            //                        this.OnMessage(WixErrors.UnableToGetAuthenticodeCertOfFile(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult)));
-            //                    }
-            //                }
-
-            //                // If we haven't added this cert to the MsiDigitalCertificate table, set it up to be added
-            //                if (!certificates.ContainsKey(cert2.Thumbprint))
-            //                {
-            //                    // generate a stable identifier
-            //                    string certificateGeneratedId = Common.GenerateIdentifier("cer", cert2.Thumbprint);
-
-            //                    // Add it to our "add to MsiDigitalCertificate" table dictionary
-            //                    Row digitalCertificateRow = digitalCertificateTable.CreateRow(null);
-            //                    digitalCertificateRow[0] = certificateGeneratedId;
-
-            //                    // Export to a file, because the MSI API's require us to provide a file path on disk
-            //                    string certPath = Path.Combine(this.TempFilesLocation, "MsiDigitalCertificate");
-            //                    Directory.CreateDirectory(certPath);
-            //                    certPath = Path.Combine(certPath, string.Concat(cert2.Thumbprint, ".cer"));
-            //                    File.Delete(certPath);
-
-            //                    using (BinaryWriter writer = new BinaryWriter(File.Open(certPath, FileMode.Create)))
-            //                    {
-            //                        writer.Write(cert2.RawData);
-            //                        writer.Close();
-            //                    }
-
-            //                    // Now set the file path on disk where this binary stream will be picked up at import time
-            //                    digitalCertificateRow[1] = string.Concat(cert2.Thumbprint, ".cer");
-
-            //                    certificates.Add(cert2.Thumbprint, certificateGeneratedId);
-            //                }
-
-            //                digitalSignatureRow = digitalSignatureTable.CreateRow(null);
-
-            //                digitalSignatureRow[0] = "Media";
-            //                digitalSignatureRow[1] = cabId;
-            //                digitalSignatureRow[2] = certificates[cert2.Thumbprint];
-            //            }
-            //        }
-            //    }
-
-            //    if (digitalCertificateTable.Rows.Count > 0)
-            //    {
-            //        database.ImportTable(codepage, digitalCertificateTable, this.TempFilesLocation, true);
-            //        shouldCommit = true;
-            //    }
-
-            //    if (digitalSignatureTable.Rows.Count > 0)
-            //    {
-            //        database.ImportTable(codepage, digitalSignatureTable, this.TempFilesLocation, true);
-            //        shouldCommit = true;
-            //    }
-
-            //    // TODO: if we created the table(s), then we should add the _Validation records for them.
-
-            //    certificates = null;
-
-            //    // If we did find external cabs but none of them were signed, give a warning
-            //    if (foundUnsignedExternals)
-            //    {
-            //        this.OnMessage(WixWarnings.ExternalCabsAreNotSigned(databaseFile));
-            //    }
-
-            //    if (shouldCommit)
-            //    {
-            //        database.Commit();
-            //    }
-            //}
-
-            //return shouldCommit;
-            return false;
-        }
-
-        /// <summary>
-        /// Cleans up the temp files used by the Inscriber.
-        /// </summary>
-        /// <returns>True if all files were deleted, false otherwise.</returns>
-        public bool DeleteTempFiles()
-        {
-#if REDO_IN_NETCORE
-            if (null == this.tempFiles)
-            {
-                return true; // no work to do
-            }
-            else
-            {
-                bool deleted = Common.DeleteTempFiles(this.TempFilesLocation, this);
-
-                if (deleted)
-                {
-                    ((IDisposable)this.tempFiles).Dispose();
-                    this.tempFiles = null; // temp files have been deleted, no need to remember this now
-                }
-
-                return deleted;
-            }
-#endif
-            return true;
-        }
-    }
-}
diff --git a/src/WixToolset.Core/WixToolset.Core.csproj b/src/WixToolset.Core/WixToolset.Core.csproj
index 947c445f..abb9bcb8 100644
--- a/src/WixToolset.Core/WixToolset.Core.csproj
+++ b/src/WixToolset.Core/WixToolset.Core.csproj
@@ -16,6 +16,7 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Data" Version="4.0.*" />
     <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
   </ItemGroup>
 
   <!--