Merge Dtf

147 files changed, 40034 insertions, 0 deletions

diff --git a/src/dtf/CSharp.Build.props b/src/dtf/CSharp.Build.props
new file mode 100644
index 00000000..81d24ad1
--- /dev/null
+++ b/src/dtf/CSharp.Build.props
@@ -0,0 +1,13 @@
+<!-- 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. -->
+<!--
+  Do NOT modify this file. Update the canonical version in Home\repo-template\src\CSharp.Build.props
+  then update all of the repos.
+-->
+<Project>
+  <PropertyGroup>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
+    <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
+  </PropertyGroup>
+</Project>
diff --git a/src/dtf/Cpp.Build.props b/src/dtf/Cpp.Build.props
new file mode 100644
index 00000000..44a042c7
--- /dev/null
+++ b/src/dtf/Cpp.Build.props
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project>
+  <PropertyGroup>
+    <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
+    <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
+    <OutDir>$(OutputPath)$(Platform)\</OutDir>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
+    <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+
+  <ItemDefinitionGroup>
+    <ClCompile>
+      <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
+      <WarningLevel>Level4</WarningLevel>
+      <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
+      <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <ExceptionHandling>false</ExceptionHandling>
+      <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
+      <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>$(ArmPreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+    <Lib>
+      <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Lib>
+    <Link>
+      <SubSystem>$(ProjectSubSystem)</SubSystem>
+      <ModuleDefinitionFile>$(ProjectModuleDefinitionFile)</ModuleDefinitionFile>
+      <NoEntryPoint>$(ResourceOnlyDll)</NoEntryPoint>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>$(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/IGNORE:4099 %(AdditionalOptions)</AdditionalOptions>
+    </Link>
+  </ItemDefinitionGroup>
+
+  <ItemDefinitionGroup Condition=" '$(Platform)'=='Win32' and '$(PlatformToolset)'!='v100'">
+    <ClCompile>
+      <EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Platform)'=='arm' ">
+    <ClCompile>
+      <CallingConvention>CDecl</CallingConvention>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(ConfigurationType)'=='StaticLibrary' ">
+    <ClCompile>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <OmitDefaultLibName>true</OmitDefaultLibName>
+      <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' ">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <PreprocessorDefinitions>_DEBUG;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
+    <ClCompile>
+      <BasicRuntimeChecks></BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
+    <ClCompile>
+      <BasicRuntimeChecks></BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
+    <Link>
+      <KeyFile>$(LinkKeyFile)</KeyFile>
+      <DelaySign>$(LinkDelaySign)</DelaySign>
+    </Link>
+  </ItemDefinitionGroup>
+</Project>
diff --git a/src/dtf/Custom.Build.props b/src/dtf/Custom.Build.props
new file mode 100644
index 00000000..50429f77
--- /dev/null
+++ b/src/dtf/Custom.Build.props
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project>
+  <PropertyGroup>
+    <DebugType>embedded</DebugType>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(UsingMicrosoftNETSdk)'!='true' and '$(Configuration)' == 'Debug' ">
+    <DebugSymbols>true</DebugSymbols>
+    <Optimize>false</Optimize>
+    <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(UsingMicrosoftNETSdk)'!='true' and '$(Configuration)' == 'Release' ">
+    <DebugSymbols>false</DebugSymbols>
+    <Optimize>true</Optimize>
+    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
+  </PropertyGroup>
+</Project>
diff --git a/src/dtf/Directory.Build.props b/src/dtf/Directory.Build.props
new file mode 100644
index 00000000..f83cc154
--- /dev/null
+++ b/src/dtf/Directory.Build.props
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+<!--
+  Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.props
+  then update all of the repos.
+-->
+<Project>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
+    <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages>
+
+    <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
+    <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>
+    <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
+    <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
+
+    <Authors>WiX Toolset Team</Authors>
+    <Company>WiX Toolset</Company>
+    <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
+    <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
+    <Product>WiX Toolset</Product>
+  </PropertyGroup>
+
+  <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " />
+  <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
+  <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
+  <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
+</Project>
diff --git a/src/dtf/Directory.Build.targets b/src/dtf/Directory.Build.targets
new file mode 100644
index 00000000..cb988931
--- /dev/null
+++ b/src/dtf/Directory.Build.targets
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+<!--
+  Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.Build.targets
+  then update all of the repos.
+-->
+<!--
+  Replace PackageReferences with ProjectReferences when the projects can be found in .sln.
+  See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
+-->
+<Project>
+  <PropertyGroup>
+    <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
+    <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ReplacePackageReferences>true</ReplacePackageReferences>
+    <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
+    <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath>
+  </PropertyGroup>
+
+  <Choose>
+    <When Condition="$(ReplacePackageReferences) AND '$(TheSolutionPath)' != '' AND '$(TheSolutionPath)' != '*undefined*' AND Exists('$(TheSolutionPath)')">
+
+      <PropertyGroup>
+        <SolutionFileContent>$([System.IO.File]::ReadAllText($(TheSolutionPath)))</SolutionFileContent>
+        <SmartSolutionDir>$([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) ))</SmartSolutionDir>
+        <RegexPattern>(?&lt;="[PackageName]", ")(.*)(?=", ")</RegexPattern>
+      </PropertyGroup>
+
+      <ItemGroup>
+        <!-- Keep the identity of the PackageReference -->
+        <SmartPackageReference Include="@(PackageReference)">
+          <PackageName>%(Identity)</PackageName>
+          <InSolution>$(SolutionFileContent.Contains('\%(Identity).csproj'))</InSolution>
+        </SmartPackageReference>
+
+        <!-- Filter them by mapping them to another ItemGroup using the WithMetadataValue item function -->
+        <PackageInSolution Include="@(SmartPackageReference->WithMetadataValue('InSolution', True))">
+          <Pattern>$(RegexPattern.Replace('[PackageName]','%(PackageName)') )</Pattern>
+          <SmartPath>$([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)'))</SmartPath>
+        </PackageInSolution>
+
+        <ProjectReference  Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
+
+        <!-- Remove the package references that are now referenced as projects -->
+        <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/>
+      </ItemGroup>
+
+    </When>
+  </Choose>
+
+  <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
+  <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
+</Project>
diff --git a/src/dtf/README.md b/src/dtf/README.md
new file mode 100644
index 00000000..80f3b0e5
--- /dev/null
+++ b/src/dtf/README.md
@@ -0,0 +1,2 @@
+# Dtf
+WixToolset.Dtf - managed libraries for the Windows Installer
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/AssemblyInfo.cs b/src/dtf/WixToolset.Dtf.Compression.Cab/AssemblyInfo.cs
new file mode 100644
index 00000000..aea5bf2e
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+// 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.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "WixToolset.Dtf.Compression.Cab")]
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/CabEngine.cs b/src/dtf/WixToolset.Dtf.Compression.Cab/CabEngine.cs
new file mode 100644
index 00000000..ab135fd8
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/CabEngine.cs
@@ -0,0 +1,164 @@
+// 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.Dtf.Compression.Cab
+{
+    using System;
+    using System.IO;
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Engine capable of packing and unpacking archives in the cabinet format.
+    /// </summary>
+    public class CabEngine : CompressionEngine
+    {
+        private CabPacker packer;
+        private CabUnpacker unpacker;
+
+        /// <summary>
+        /// Creates a new instance of the cabinet engine.
+        /// </summary>
+        public CabEngine()
+            : base()
+        {
+        }
+
+        /// <summary>
+        /// Disposes of resources allocated by the cabinet engine.
+        /// </summary>
+        /// <param name="disposing">If true, the method has been called directly
+        /// or indirectly by a user's code, so managed and unmanaged resources
+        /// will be disposed. If false, the method has been called by the runtime
+        /// from inside the finalizer, and only unmanaged resources will be
+        /// disposed.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing)
+            {
+                if (packer != null)
+                {
+                    packer.Dispose();
+                    packer = null;
+                }
+                if (unpacker != null)
+                {
+                    unpacker.Dispose();
+                    unpacker = null;
+                }
+            }
+
+            base.Dispose(disposing);
+        }
+
+        private CabPacker Packer
+        {
+            get
+            {
+                if (this.packer == null)
+                {
+                    this.packer = new CabPacker(this);
+                }
+
+                return this.packer;
+            }
+        }
+
+        private CabUnpacker Unpacker
+        {
+            get
+            {
+                if (this.unpacker == null)
+                {
+                    this.unpacker = new CabUnpacker(this);
+                }
+
+                return this.unpacker;
+            }
+        }
+
+        /// <summary>
+        /// Creates a cabinet or chain of cabinets.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of cabinet and file streams.</param>
+        /// <param name="files">The paths of the files in the archive (not
+        /// external file paths).</param>
+        /// <param name="maxArchiveSize">The maximum number of bytes for one
+        /// cabinet before the contents are chained to the next cabinet, or zero
+        /// for unlimited cabinet size.</param>
+        /// <exception cref="ArchiveException">The cabinet could not be
+        /// created.</exception>
+        /// <remarks>
+        /// The stream context implementation may provide a mapping from the
+        /// file paths within the cabinet to the external file paths.
+        /// <para>Smaller folder sizes can make it more efficient to extract
+        /// individual files out of large cabinet packages.</para>
+        /// </remarks>
+        public override void Pack(
+            IPackStreamContext streamContext,
+            IEnumerable<string> files,
+            long maxArchiveSize)
+        {
+            this.Packer.CompressionLevel = this.CompressionLevel;
+            this.Packer.UseTempFiles = this.UseTempFiles;
+            this.Packer.Pack(streamContext, files, maxArchiveSize);
+        }
+
+        /// <summary>
+        /// Checks whether a Stream begins with a header that indicates
+        /// it is a valid cabinet file.
+        /// </summary>
+        /// <param name="stream">Stream for reading the cabinet file.</param>
+        /// <returns>True if the stream is a valid cabinet file
+        /// (with no offset); false otherwise.</returns>
+        public override bool IsArchive(Stream stream)
+        {
+            return this.Unpacker.IsArchive(stream);
+        }
+
+        /// <summary>
+        /// Gets information about files in a cabinet or cabinet chain.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of cabinet and file streams.</param>
+        /// <param name="fileFilter">A predicate that can determine
+        /// which files to process, optional.</param>
+        /// <returns>Information about files in the cabinet stream.</returns>
+        /// <exception cref="ArchiveException">The cabinet provided
+        /// by the stream context is not valid.</exception>
+        /// <remarks>
+        /// The <paramref name="fileFilter"/> predicate takes an internal file
+        /// path and returns true to include the file or false to exclude it.
+        /// </remarks>
+        public override IList<ArchiveFileInfo> GetFileInfo(
+            IUnpackStreamContext streamContext,
+            Predicate<string> fileFilter)
+        {
+            return this.Unpacker.GetFileInfo(streamContext, fileFilter);
+        }
+
+        /// <summary>
+        /// Extracts files from a cabinet or cabinet chain.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of cabinet and file streams.</param>
+        /// <param name="fileFilter">An optional predicate that can determine
+        /// which files to process.</param>
+        /// <exception cref="ArchiveException">The cabinet provided
+        /// by the stream context is not valid.</exception>
+        /// <remarks>
+        /// The <paramref name="fileFilter"/> predicate takes an internal file
+        /// path and returns true to include the file or false to exclude it.
+        /// </remarks>
+        public override void Unpack(
+            IUnpackStreamContext streamContext,
+            Predicate<string> fileFilter)
+        {
+            this.Unpacker.Unpack(streamContext, fileFilter);
+        }
+
+        internal void ReportProgress(ArchiveProgressEventArgs e)
+        {
+            base.OnProgress(e);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/CabException.cs b/src/dtf/WixToolset.Dtf.Compression.Cab/CabException.cs
new file mode 100644
index 00000000..e03f9f3a
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/CabException.cs
@@ -0,0 +1,154 @@
+// 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.Dtf.Compression.Cab
+{
+    using System;
+    using System.IO;
+    using System.Resources;
+    using System.Globalization;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Exception class for cabinet operations.
+    /// </summary>
+    [Serializable]
+    public class CabException : ArchiveException
+    {
+        private static ResourceManager errorResources;
+        private int error;
+        private int errorCode;
+
+        /// <summary>
+        /// Creates a new CabException with a specified error message and a reference to the
+        /// inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception. If the
+        /// innerException parameter is not a null reference (Nothing in Visual Basic), the current exception
+        /// is raised in a catch block that handles the inner exception.</param>
+        public CabException(string message, Exception innerException)
+            : this(0, 0, message, innerException) { }
+
+        /// <summary>
+        /// Creates a new CabException with a specified error message.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public CabException(string message)
+            : this(0, 0, message, null) { }
+
+        /// <summary>
+        /// Creates a new CabException.
+        /// </summary>
+        public CabException()
+            : this(0, 0, null, null) { }
+
+        internal CabException(int error, int errorCode, string message, Exception innerException)
+            : base(message, innerException)
+        {
+            this.error = error;
+            this.errorCode = errorCode;
+        }
+
+        internal CabException(int error, int errorCode, string message)
+            : this(error, errorCode, message, null) { }
+
+        /// <summary>
+        /// Initializes a new instance of the CabException class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected CabException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+
+            this.error = info.GetInt32("cabError");
+            this.errorCode = info.GetInt32("cabErrorCode");
+        }
+
+        /// <summary>
+        /// Gets the FCI or FDI cabinet engine error number.
+        /// </summary>
+        /// <value>A cabinet engine error number, or 0 if the exception was
+        /// not related to a cabinet engine error number.</value>
+        public int Error
+        {
+            get
+            {
+                return this.error;
+            }
+        }
+
+        /// <summary>
+        /// Gets the Win32 error code.
+        /// </summary>
+        /// <value>A Win32 error code, or 0 if the exception was
+        /// not related to a Win32 error.</value>
+        public int ErrorCode
+        {
+            get
+            {
+                return this.errorCode;
+            }
+        }
+
+        internal static ResourceManager ErrorResources
+        {
+            get
+            {
+                if (errorResources == null)
+                {
+                    errorResources = new ResourceManager(
+                        typeof(CabException).Namespace + ".Errors",
+                        typeof(CabException).Assembly);
+                }
+                return errorResources;
+            }
+        }
+
+        /// <summary>
+        /// Sets the SerializationInfo with information about the exception.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+
+            info.AddValue("cabError", this.error);
+            info.AddValue("cabErrorCode", this.errorCode);
+            base.GetObjectData(info, context);
+        }
+
+        internal static string GetErrorMessage(int error, int errorCode, bool extracting)
+        {
+            const int FCI_ERROR_RESOURCE_OFFSET = 1000;
+            const int FDI_ERROR_RESOURCE_OFFSET = 2000;
+            int resourceOffset = (extracting ? FDI_ERROR_RESOURCE_OFFSET : FCI_ERROR_RESOURCE_OFFSET);
+
+            string msg = CabException.ErrorResources.GetString(
+                (resourceOffset + error).ToString(CultureInfo.InvariantCulture.NumberFormat),
+                CultureInfo.CurrentCulture);
+
+            if (msg == null)
+            {
+                msg = CabException.ErrorResources.GetString(
+                    resourceOffset.ToString(CultureInfo.InvariantCulture.NumberFormat),
+                    CultureInfo.CurrentCulture);
+            }
+
+            if (errorCode != 0)
+            {
+                const string GENERIC_ERROR_RESOURCE = "1";
+                string msg2 = CabException.ErrorResources.GetString(GENERIC_ERROR_RESOURCE, CultureInfo.CurrentCulture);
+                msg = String.Format(CultureInfo.InvariantCulture, "{0} " + msg2, msg, errorCode);
+            }
+            return msg;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/CabFileInfo.cs b/src/dtf/WixToolset.Dtf.Compression.Cab/CabFileInfo.cs
new file mode 100644
index 00000000..ad4a813c
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/CabFileInfo.cs
@@ -0,0 +1,141 @@
+// 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.Dtf.Compression.Cab
+{
+    using System;
+    using System.IO;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Object representing a compressed file within a cabinet package; provides operations for getting
+    /// the file properties and extracting the file.
+    /// </summary>
+    [Serializable]
+    public class CabFileInfo : ArchiveFileInfo
+    {
+        private int cabFolder;
+
+        /// <summary>
+        /// Creates a new CabinetFileInfo object representing a file within a cabinet in a specified path.
+        /// </summary>
+        /// <param name="cabinetInfo">An object representing the cabinet containing the file.</param>
+        /// <param name="filePath">The path to the file within the cabinet. Usually, this is a simple file
+        /// name, but if the cabinet contains a directory structure this may include the directory.</param>
+        public CabFileInfo(CabInfo cabinetInfo, string filePath)
+            : base(cabinetInfo, filePath)
+        {
+            if (cabinetInfo == null)
+            {
+                throw new ArgumentNullException("cabinetInfo");
+            }
+
+            this.cabFolder = -1;
+        }
+
+        /// <summary>
+        /// Creates a new CabinetFileInfo object with all parameters specified,
+        /// used internally when reading the metadata out of a cab.
+        /// </summary>
+        /// <param name="filePath">The internal path and name of the file in the cab.</param>
+        /// <param name="cabFolder">The folder number containing the file.</param>
+        /// <param name="cabNumber">The cabinet number where the file starts.</param>
+        /// <param name="attributes">The stored attributes of the file.</param>
+        /// <param name="lastWriteTime">The stored last write time of the file.</param>
+        /// <param name="length">The uncompressed size of the file.</param>
+        internal CabFileInfo(
+            string filePath,
+            int cabFolder,
+            int cabNumber,
+            FileAttributes attributes,
+            DateTime lastWriteTime,
+            long length)
+            : base(filePath, cabNumber, attributes, lastWriteTime, length)
+        {
+            this.cabFolder = cabFolder;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the CabinetFileInfo class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected CabFileInfo(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+            this.cabFolder = info.GetInt32("cabFolder");
+        }
+
+        /// <summary>
+        /// Sets the SerializationInfo with information about the archive.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data.</param>
+        /// <param name="context">The StreamingContext that contains contextual information
+        /// about the source or destination.</param>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+            info.AddValue("cabFolder", this.cabFolder);
+        }
+
+        /// <summary>
+        /// Gets or sets the cabinet that contains this file.
+        /// </summary>
+        /// <value>
+        /// The CabinetInfo instance that retrieved this file information -- this
+        /// may be null if the CabinetFileInfo object was returned directly from a
+        /// stream.
+        /// </value>
+        public CabInfo Cabinet
+        {
+            get
+            {
+                return (CabInfo) this.Archive;
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path of the cabinet that contains this file.
+        /// </summary>
+        /// <value>The full path of the cabinet that contains this file.</value>
+        public string CabinetName
+        {
+            get
+            {
+                return this.ArchiveName;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of the folder containing this file.
+        /// </summary>
+        /// <value>The number of the cabinet folder containing this file.</value>
+        /// <remarks>A single folder or the first folder of a cabinet
+        /// (or chain of cabinets) is numbered 0.</remarks>
+        public int CabinetFolderNumber
+        {
+            get
+            {
+                if (this.cabFolder < 0)
+                {
+                    this.Refresh();
+                }
+                return this.cabFolder;
+            }
+        }
+
+        /// <summary>
+        /// Refreshes the information in this object with new data retrieved
+        /// from an archive.
+        /// </summary>
+        /// <param name="newFileInfo">Fresh instance for the same file just
+        /// read from the archive.</param>
+        /// <remarks>
+        /// This implementation refreshes the <see cref="CabinetFolderNumber"/>.
+        /// </remarks>
+        protected override void Refresh(ArchiveFileInfo newFileInfo)
+        {
+            base.Refresh(newFileInfo);
+            this.cabFolder = ((CabFileInfo) newFileInfo).cabFolder;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/CabInfo.cs b/src/dtf/WixToolset.Dtf.Compression.Cab/CabInfo.cs
new file mode 100644
index 00000000..969dcbef
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/CabInfo.cs
@@ -0,0 +1,82 @@
+// 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.Dtf.Compression.Cab
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Object representing a cabinet file on disk; provides access to
+    /// file-based operations on the cabinet file.
+    /// </summary>
+    /// <remarks>
+    /// Generally, the methods on this class are much easier to use than the
+    /// stream-based interfaces provided by the <see cref="CabEngine"/> class.
+    /// </remarks>
+    [Serializable]
+    public class CabInfo : ArchiveInfo
+    {
+        /// <summary>
+        /// Creates a new CabinetInfo object representing a cabinet file in a specified path.
+        /// </summary>
+        /// <param name="path">The path to the cabinet file. When creating a cabinet file, this file does not
+        /// necessarily exist yet.</param>
+        public CabInfo(string path)
+            : base(path)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the CabinetInfo class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected CabInfo(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Creates a compression engine that does the low-level work for
+        /// this object.
+        /// </summary>
+        /// <returns>A new <see cref="CabEngine"/> instance.</returns>
+        /// <remarks>
+        /// Each instance will be <see cref="CompressionEngine.Dispose()"/>d
+        /// immediately after use.
+        /// </remarks>
+        protected override CompressionEngine CreateCompressionEngine()
+        {
+            return new CabEngine();
+        }
+
+        /// <summary>
+        /// Gets information about the files contained in the archive.
+        /// </summary>
+        /// <returns>A list of <see cref="CabFileInfo"/> objects, each
+        /// containing information about a file in the archive.</returns>
+        public new IList<CabFileInfo> GetFiles()
+        {
+            IList<ArchiveFileInfo> files = base.GetFiles();
+            List<CabFileInfo> cabFiles = new List<CabFileInfo>(files.Count);
+            foreach (CabFileInfo cabFile in files) cabFiles.Add(cabFile);
+            return cabFiles.AsReadOnly();
+        }
+
+        /// <summary>
+        /// Gets information about the certain files contained in the archive file.
+        /// </summary>
+        /// <param name="searchPattern">The search string, such as
+        /// &quot;*.txt&quot;.</param>
+        /// <returns>A list of <see cref="CabFileInfo"/> objects, each containing
+        /// information about a file in the archive.</returns>
+        public new IList<CabFileInfo> GetFiles(string searchPattern)
+        {
+            IList<ArchiveFileInfo> files = base.GetFiles(searchPattern);
+            List<CabFileInfo> cabFiles = new List<CabFileInfo>(files.Count);
+            foreach (CabFileInfo cabFile in files) cabFiles.Add(cabFile);
+            return cabFiles.AsReadOnly();
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/CabPacker.cs b/src/dtf/WixToolset.Dtf.Compression.Cab/CabPacker.cs
new file mode 100644
index 00000000..ec6e3bda
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/CabPacker.cs
@@ -0,0 +1,653 @@
+// 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.Dtf.Compression.Cab
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    internal class CabPacker : CabWorker
+    {
+        private const string TempStreamName = "%%TEMP%%";
+
+        private NativeMethods.FCI.Handle fciHandle;
+
+        // These delegates need to be saved as member variables
+        // so that they don't get GC'd.
+        private NativeMethods.FCI.PFNALLOC fciAllocMemHandler;
+        private NativeMethods.FCI.PFNFREE fciFreeMemHandler;
+        private NativeMethods.FCI.PFNOPEN fciOpenStreamHandler;
+        private NativeMethods.FCI.PFNREAD fciReadStreamHandler;
+        private NativeMethods.FCI.PFNWRITE fciWriteStreamHandler;
+        private NativeMethods.FCI.PFNCLOSE fciCloseStreamHandler;
+        private NativeMethods.FCI.PFNSEEK fciSeekStreamHandler;
+        private NativeMethods.FCI.PFNFILEPLACED fciFilePlacedHandler;
+        private NativeMethods.FCI.PFNDELETE fciDeleteFileHandler;
+        private NativeMethods.FCI.PFNGETTEMPFILE fciGetTempFileHandler;
+
+        private NativeMethods.FCI.PFNGETNEXTCABINET fciGetNextCabinet;
+        private NativeMethods.FCI.PFNSTATUS fciCreateStatus;
+        private NativeMethods.FCI.PFNGETOPENINFO fciGetOpenInfo;
+
+        private IPackStreamContext context;
+
+        private FileAttributes fileAttributes;
+        private DateTime fileLastWriteTime;
+
+        private int maxCabBytes;
+
+        private long totalFolderBytesProcessedInCurrentCab;
+
+        private CompressionLevel compressionLevel;
+        private bool dontUseTempFiles;
+        private IList<Stream> tempStreams;
+
+        public CabPacker(CabEngine cabEngine)
+            : base(cabEngine)
+        {
+            this.fciAllocMemHandler    = this.CabAllocMem;
+            this.fciFreeMemHandler     = this.CabFreeMem;
+            this.fciOpenStreamHandler  = this.CabOpenStreamEx;
+            this.fciReadStreamHandler  = this.CabReadStreamEx;
+            this.fciWriteStreamHandler = this.CabWriteStreamEx;
+            this.fciCloseStreamHandler = this.CabCloseStreamEx;
+            this.fciSeekStreamHandler  = this.CabSeekStreamEx;
+            this.fciFilePlacedHandler  = this.CabFilePlaced;
+            this.fciDeleteFileHandler  = this.CabDeleteFile;
+            this.fciGetTempFileHandler = this.CabGetTempFile;
+            this.fciGetNextCabinet     = this.CabGetNextCabinet;
+            this.fciCreateStatus       = this.CabCreateStatus;
+            this.fciGetOpenInfo        = this.CabGetOpenInfo;
+            this.tempStreams = new List<Stream>();
+            this.compressionLevel = CompressionLevel.Normal;
+        }
+
+        public bool UseTempFiles
+        {
+            get
+            {
+                return !this.dontUseTempFiles;
+            }
+
+            set
+            {
+                this.dontUseTempFiles = !value;
+            }
+        }
+
+        public CompressionLevel CompressionLevel
+        {
+            get
+            {
+                return this.compressionLevel;
+            }
+
+            set
+            {
+                this.compressionLevel = value;
+            }
+        }
+
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        private void CreateFci(long maxArchiveSize)
+        {
+            NativeMethods.FCI.CCAB ccab = new NativeMethods.FCI.CCAB();
+            if (maxArchiveSize > 0 && maxArchiveSize < ccab.cb)
+            {
+                ccab.cb = Math.Max(
+                    NativeMethods.FCI.MIN_DISK, (int) maxArchiveSize);
+            }
+
+            object maxFolderSizeOption = this.context.GetOption(
+                "maxFolderSize", null);
+            if (maxFolderSizeOption != null)
+            {
+                long maxFolderSize = Convert.ToInt64(
+                    maxFolderSizeOption, CultureInfo.InvariantCulture);
+                if (maxFolderSize > 0 && maxFolderSize < ccab.cbFolderThresh)
+                {
+                    ccab.cbFolderThresh = (int) maxFolderSize;
+                }
+            }
+
+            this.maxCabBytes = ccab.cb;
+            ccab.szCab = this.context.GetArchiveName(0);
+            if (ccab.szCab == null)
+            {
+                throw new FileNotFoundException(
+                    "Cabinet name not provided by stream context.");
+            }
+            ccab.setID = (short) new Random().Next(
+                Int16.MinValue, Int16.MaxValue + 1);
+            this.CabNumbers[ccab.szCab] = 0;
+            this.currentArchiveName = ccab.szCab;
+            this.totalArchives = 1;
+            this.CabStream = null;
+
+            this.Erf.Clear();
+            this.fciHandle = NativeMethods.FCI.Create(
+                this.ErfHandle.AddrOfPinnedObject(),
+                this.fciFilePlacedHandler,
+                this.fciAllocMemHandler,
+                this.fciFreeMemHandler,
+                this.fciOpenStreamHandler,
+                this.fciReadStreamHandler,
+                this.fciWriteStreamHandler,
+                this.fciCloseStreamHandler,
+                this.fciSeekStreamHandler,
+                this.fciDeleteFileHandler,
+                this.fciGetTempFileHandler,
+                ccab,
+                IntPtr.Zero);
+            this.CheckError(false);
+        }
+
+        public void Pack(
+            IPackStreamContext streamContext,
+            IEnumerable<string> files,
+            long maxArchiveSize)
+        {
+            if (streamContext == null)
+            {
+                throw new ArgumentNullException("streamContext");
+            }
+
+            if (files == null)
+            {
+                throw new ArgumentNullException("files");
+            }
+
+            lock (this)
+            {
+                try
+                {
+                    this.context = streamContext;
+
+                    this.ResetProgressData();
+
+                    this.CreateFci(maxArchiveSize);
+
+                    foreach (string file in files)
+                    {
+                        FileAttributes attributes;
+                        DateTime lastWriteTime;
+                        Stream fileStream = this.context.OpenFileReadStream(
+                            file,
+                            out attributes,
+                            out lastWriteTime);
+                        if (fileStream != null)
+                        {
+                            this.totalFileBytes += fileStream.Length;
+                            this.totalFiles++;
+                            this.context.CloseFileReadStream(file, fileStream);
+                        }
+                    }
+
+                    long uncompressedBytesInFolder = 0;
+                    this.currentFileNumber = -1;
+
+                    foreach (string file in files)
+                    {
+                        FileAttributes attributes;
+                        DateTime lastWriteTime;
+                        Stream fileStream = this.context.OpenFileReadStream(
+                            file, out attributes, out lastWriteTime);
+                        if (fileStream == null)
+                        {
+                            continue;
+                        }
+
+                        if (fileStream.Length >= (long) NativeMethods.FCI.MAX_FOLDER)
+                        {
+                            throw new NotSupportedException(String.Format(
+                                CultureInfo.InvariantCulture,
+                                "File {0} exceeds maximum file size " +
+                                "for cabinet format.",
+                                file));
+                        }
+
+                        if (uncompressedBytesInFolder > 0)
+                        {
+                            // Automatically create a new folder if this file
+                            // won't fit in the current folder.
+                            bool nextFolder = uncompressedBytesInFolder
+                                + fileStream.Length >= (long) NativeMethods.FCI.MAX_FOLDER;
+
+                            // Otherwise ask the client if it wants to
+                            // move to the next folder.
+                            if (!nextFolder)
+                            {
+                                object nextFolderOption = streamContext.GetOption(
+                                    "nextFolder",
+                                    new object[] { file, this.currentFolderNumber });
+                                nextFolder = Convert.ToBoolean(
+                                    nextFolderOption, CultureInfo.InvariantCulture);
+                            }
+
+                            if (nextFolder)
+                            {
+                                this.FlushFolder();
+                                uncompressedBytesInFolder = 0;
+                            }
+                        }
+
+                        if (this.currentFolderTotalBytes > 0)
+                        {
+                            this.currentFolderTotalBytes = 0;
+                            this.currentFolderNumber++;
+                            uncompressedBytesInFolder = 0;
+                        }
+
+                        this.currentFileName = file;
+                        this.currentFileNumber++;
+
+                        this.currentFileTotalBytes = fileStream.Length;
+                        this.currentFileBytesProcessed = 0;
+                        this.OnProgress(ArchiveProgressType.StartFile);
+
+                        uncompressedBytesInFolder += fileStream.Length;
+
+                        this.AddFile(
+                            file,
+                            fileStream,
+                            attributes,
+                            lastWriteTime,
+                            false,
+                            this.CompressionLevel);
+                    }
+
+                    this.FlushFolder();
+                    this.FlushCabinet();
+                }
+                finally
+                {
+                    if (this.CabStream != null)
+                    {
+                        this.context.CloseArchiveWriteStream(
+                            this.currentArchiveNumber,
+                            this.currentArchiveName,
+                            this.CabStream);
+                        this.CabStream = null;
+                    }
+
+                    if (this.FileStream != null)
+                    {
+                        this.context.CloseFileReadStream(
+                            this.currentFileName, this.FileStream);
+                        this.FileStream = null;
+                    }
+                    this.context = null;
+
+                    if (this.fciHandle != null)
+                    {
+                        this.fciHandle.Dispose();
+                        this.fciHandle = null;
+                    }
+                }
+            }
+        }
+
+        internal override int CabOpenStreamEx(string path, int openFlags, int shareMode, out int err, IntPtr pv)
+        {
+            if (this.CabNumbers.ContainsKey(path))
+            {
+                Stream stream = this.CabStream;
+                if (stream == null)
+                {
+                    short cabNumber = this.CabNumbers[path];
+
+                    this.currentFolderTotalBytes = 0;
+
+                    stream = this.context.OpenArchiveWriteStream(cabNumber, path, true, this.CabEngine);
+                    if (stream == null)
+                    {
+                        throw new FileNotFoundException(
+                            String.Format(CultureInfo.InvariantCulture, "Cabinet {0} not provided.", cabNumber));
+                    }
+                    this.currentArchiveName = path;
+
+                    this.currentArchiveTotalBytes = Math.Min(
+                        this.totalFolderBytesProcessedInCurrentCab, this.maxCabBytes);
+                    this.currentArchiveBytesProcessed = 0;
+
+                    this.OnProgress(ArchiveProgressType.StartArchive);
+                    this.CabStream = stream;
+                }
+                path = CabWorker.CabStreamName;
+            }
+            else if (path == CabPacker.TempStreamName)
+            {
+                // Opening memory stream for a temp file.
+                Stream stream = new MemoryStream();
+                this.tempStreams.Add(stream);
+                int streamHandle = this.StreamHandles.AllocHandle(stream);
+                err = 0;
+                return streamHandle;
+            }
+            else if (path != CabWorker.CabStreamName)
+            {
+                // Opening a file on disk for a temp file.
+                path = Path.Combine(Path.GetTempPath(), path);
+                Stream stream = new FileStream(path, FileMode.Open, FileAccess.ReadWrite);
+                this.tempStreams.Add(stream);
+                stream = new DuplicateStream(stream);
+                int streamHandle = this.StreamHandles.AllocHandle(stream);
+                err = 0;
+                return streamHandle;
+            }
+            return base.CabOpenStreamEx(path, openFlags, shareMode, out err, pv);
+        }
+
+        internal override int CabWriteStreamEx(int streamHandle, IntPtr memory, int cb, out int err, IntPtr pv)
+        {
+            int count = base.CabWriteStreamEx(streamHandle, memory, cb, out err, pv);
+            if (count > 0 && err == 0)
+            {
+                Stream stream = this.StreamHandles[streamHandle];
+                if (DuplicateStream.OriginalStream(stream) ==
+                    DuplicateStream.OriginalStream(this.CabStream))
+                {
+                    this.currentArchiveBytesProcessed += cb;
+                    if (this.currentArchiveBytesProcessed > this.currentArchiveTotalBytes)
+                    {
+                        this.currentArchiveBytesProcessed = this.currentArchiveTotalBytes;
+                    }
+                }
+            }
+            return count;
+        }
+
+        internal override int CabCloseStreamEx(int streamHandle, out int err, IntPtr pv)
+        {
+            Stream stream = DuplicateStream.OriginalStream(this.StreamHandles[streamHandle]);
+
+            if (stream == DuplicateStream.OriginalStream(this.FileStream))
+            {
+                this.context.CloseFileReadStream(this.currentFileName, stream);
+                this.FileStream = null;
+                long remainder = this.currentFileTotalBytes - this.currentFileBytesProcessed;
+                this.currentFileBytesProcessed += remainder;
+                this.fileBytesProcessed += remainder;
+                this.OnProgress(ArchiveProgressType.FinishFile);
+
+                this.currentFileTotalBytes = 0;
+                this.currentFileBytesProcessed = 0;
+                this.currentFileName = null;
+            }
+            else if (stream == DuplicateStream.OriginalStream(this.CabStream))
+            {
+                if (stream.CanWrite)
+                {
+                    stream.Flush();
+                }
+
+                this.currentArchiveBytesProcessed = this.currentArchiveTotalBytes;
+                this.OnProgress(ArchiveProgressType.FinishArchive);
+                this.currentArchiveNumber++;
+                this.totalArchives++;
+
+                this.context.CloseArchiveWriteStream(
+                    this.currentArchiveNumber,
+                    this.currentArchiveName,
+                    stream);
+
+                this.currentArchiveName = this.NextCabinetName;
+                this.currentArchiveBytesProcessed = this.currentArchiveTotalBytes = 0;
+                this.totalFolderBytesProcessedInCurrentCab = 0;
+
+                this.CabStream = null;
+            }
+            else  // Must be a temp stream
+            {
+                stream.Close();
+                this.tempStreams.Remove(stream);
+            }
+            return base.CabCloseStreamEx(streamHandle, out err, pv);
+        }
+
+        /// <summary>
+        /// Disposes of resources allocated by the cabinet engine.
+        /// </summary>
+        /// <param name="disposing">If true, the method has been called directly or indirectly by a user's code,
+        /// so managed and unmanaged resources will be disposed. If false, the method has been called by the 
+        /// runtime from inside the finalizer, and only unmanaged resources will be disposed.</param>
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        protected override void Dispose(bool disposing) 
+        {
+            try
+            {
+                if (disposing)
+                {
+                    if (this.fciHandle != null)
+                    {
+                        this.fciHandle.Dispose();
+                        this.fciHandle = null;
+                    }
+                }
+            }
+            finally
+            {
+                base.Dispose(disposing);
+            }
+        }
+
+        private static NativeMethods.FCI.TCOMP GetCompressionType(CompressionLevel compLevel)
+        {
+            if (compLevel < CompressionLevel.Min)
+            {
+                return NativeMethods.FCI.TCOMP.TYPE_NONE;
+            }
+            else
+            {
+                if (compLevel > CompressionLevel.Max)
+                {
+                    compLevel = CompressionLevel.Max;
+                }
+
+                int lzxWindowMax =
+                    ((int) NativeMethods.FCI.TCOMP.LZX_WINDOW_HI >> (int) NativeMethods.FCI.TCOMP.SHIFT_LZX_WINDOW) -
+                    ((int) NativeMethods.FCI.TCOMP.LZX_WINDOW_LO >> (int) NativeMethods.FCI.TCOMP.SHIFT_LZX_WINDOW);
+                int lzxWindow = lzxWindowMax *
+                    (compLevel - CompressionLevel.Min) / (CompressionLevel.Max - CompressionLevel.Min);
+
+                return (NativeMethods.FCI.TCOMP) ((int) NativeMethods.FCI.TCOMP.TYPE_LZX |
+                    ((int) NativeMethods.FCI.TCOMP.LZX_WINDOW_LO +
+                    (lzxWindow << (int) NativeMethods.FCI.TCOMP.SHIFT_LZX_WINDOW)));
+            }
+        }
+
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        private void AddFile(
+            string name,
+            Stream stream,
+            FileAttributes attributes,
+            DateTime lastWriteTime,
+            bool execute,
+            CompressionLevel compLevel)
+        {
+            this.FileStream = stream;
+            this.fileAttributes = attributes &
+                (FileAttributes.Archive | FileAttributes.Hidden | FileAttributes.ReadOnly | FileAttributes.System);
+            this.fileLastWriteTime = lastWriteTime;
+            this.currentFileName = name;
+
+            NativeMethods.FCI.TCOMP tcomp = CabPacker.GetCompressionType(compLevel);
+
+            IntPtr namePtr = IntPtr.Zero;
+            try
+            {
+                Encoding nameEncoding = Encoding.ASCII;
+                if (Encoding.UTF8.GetByteCount(name) > name.Length)
+                {
+                    nameEncoding = Encoding.UTF8;
+                    this.fileAttributes |= FileAttributes.Normal;  // _A_NAME_IS_UTF
+                }
+
+                byte[] nameBytes = nameEncoding.GetBytes(name);
+                namePtr = Marshal.AllocHGlobal(nameBytes.Length + 1);
+                Marshal.Copy(nameBytes, 0, namePtr, nameBytes.Length);
+                Marshal.WriteByte(namePtr, nameBytes.Length, 0);
+
+                this.Erf.Clear();
+                NativeMethods.FCI.AddFile(
+                    this.fciHandle,
+                    String.Empty,
+                    namePtr,
+                    execute,
+                    this.fciGetNextCabinet,
+                    this.fciCreateStatus,
+                    this.fciGetOpenInfo,
+                    tcomp);
+            }
+            finally
+            {
+                if (namePtr != IntPtr.Zero)
+                {
+                    Marshal.FreeHGlobal(namePtr);
+                }
+            }
+
+            this.CheckError(false);
+            this.FileStream = null;
+            this.currentFileName = null;
+        }
+
+        private void FlushFolder()
+        {
+            this.Erf.Clear();
+            NativeMethods.FCI.FlushFolder(this.fciHandle, this.fciGetNextCabinet, this.fciCreateStatus);
+            this.CheckError(false);
+        }
+
+        private void FlushCabinet()
+        {
+            this.Erf.Clear();
+            NativeMethods.FCI.FlushCabinet(this.fciHandle, false, this.fciGetNextCabinet, this.fciCreateStatus);
+            this.CheckError(false);
+        }
+
+        private int CabGetOpenInfo(
+            string path,
+            out short date,
+            out short time,
+            out short attribs,
+            out int err,
+            IntPtr pv)
+        {
+            CompressionEngine.DateTimeToDosDateAndTime(this.fileLastWriteTime, out date, out time);
+            attribs = (short) this.fileAttributes;
+
+            Stream stream = this.FileStream;
+            this.FileStream = new DuplicateStream(stream);
+            int streamHandle = this.StreamHandles.AllocHandle(stream);
+            err = 0;
+            return streamHandle;
+        }
+
+        private int CabFilePlaced(
+            IntPtr pccab,
+            string filePath,
+            long fileSize,
+            int continuation,
+            IntPtr pv)
+        {
+            return 0;
+        }
+
+        private int CabGetNextCabinet(IntPtr pccab, uint prevCabSize, IntPtr pv)
+        {
+            NativeMethods.FCI.CCAB nextCcab = new NativeMethods.FCI.CCAB();
+            Marshal.PtrToStructure(pccab, nextCcab);
+
+            nextCcab.szDisk = String.Empty;
+            nextCcab.szCab = this.context.GetArchiveName(nextCcab.iCab);
+            this.CabNumbers[nextCcab.szCab] = (short) nextCcab.iCab;
+            this.NextCabinetName = nextCcab.szCab;
+
+            Marshal.StructureToPtr(nextCcab, pccab, false);
+            return 1;
+        }
+
+        private int CabCreateStatus(NativeMethods.FCI.STATUS typeStatus, uint cb1, uint cb2, IntPtr pv)
+        {
+            switch (typeStatus)
+            {
+                case NativeMethods.FCI.STATUS.FILE:
+                    if (cb2 > 0 && this.currentFileBytesProcessed < this.currentFileTotalBytes)
+                    {
+                        if (this.currentFileBytesProcessed + cb2 > this.currentFileTotalBytes)
+                        {
+                            cb2 = (uint) this.currentFileTotalBytes - (uint) this.currentFileBytesProcessed;
+                        }
+                        this.currentFileBytesProcessed += cb2;
+                        this.fileBytesProcessed += cb2;
+
+                        this.OnProgress(ArchiveProgressType.PartialFile);
+                    }
+                    break;
+
+                case NativeMethods.FCI.STATUS.FOLDER:
+                    if (cb1 == 0)
+                    {
+                        this.currentFolderTotalBytes = cb2 - this.totalFolderBytesProcessedInCurrentCab;
+                        this.totalFolderBytesProcessedInCurrentCab = cb2;
+                    }
+                    else if (this.currentFolderTotalBytes == 0)
+                    {
+                        this.OnProgress(ArchiveProgressType.PartialArchive);
+                    }
+                    break;
+
+                case NativeMethods.FCI.STATUS.CABINET:
+                    break;
+            }
+            return 0;
+        }
+
+        private int CabGetTempFile(IntPtr tempNamePtr, int tempNameSize, IntPtr pv)
+        {
+            string tempFileName;
+            if (this.UseTempFiles)
+            {
+                tempFileName = Path.GetFileName(Path.GetTempFileName());
+            }
+            else
+            {
+                tempFileName = CabPacker.TempStreamName;
+            }
+
+            byte[] tempNameBytes = Encoding.ASCII.GetBytes(tempFileName);
+            if (tempNameBytes.Length >= tempNameSize)
+            {
+                return -1;
+            }
+
+            Marshal.Copy(tempNameBytes, 0, tempNamePtr, tempNameBytes.Length);
+            Marshal.WriteByte(tempNamePtr, tempNameBytes.Length, 0);  // null-terminator
+            return 1;
+        }
+
+        private int CabDeleteFile(string path, out int err, IntPtr pv)
+        {
+            try
+            {
+                // Deleting a temp file - don't bother if it is only a memory stream.
+                if (path != CabPacker.TempStreamName)
+                {
+                    path = Path.Combine(Path.GetTempPath(), path);
+                    File.Delete(path);
+                }
+            }
+            catch (IOException)
+            {
+                // Failure to delete a temp file is not fatal.
+            }
+            err = 0;
+            return 1;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/CabUnpacker.cs b/src/dtf/WixToolset.Dtf.Compression.Cab/CabUnpacker.cs
new file mode 100644
index 00000000..b0be4a15
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/CabUnpacker.cs
@@ -0,0 +1,566 @@
+// 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.Dtf.Compression.Cab
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    internal class CabUnpacker : CabWorker
+    {
+        private NativeMethods.FDI.Handle fdiHandle;
+
+        // These delegates need to be saved as member variables
+        // so that they don't get GC'd.
+        private NativeMethods.FDI.PFNALLOC fdiAllocMemHandler;
+        private NativeMethods.FDI.PFNFREE fdiFreeMemHandler;
+        private NativeMethods.FDI.PFNOPEN fdiOpenStreamHandler;
+        private NativeMethods.FDI.PFNREAD fdiReadStreamHandler;
+        private NativeMethods.FDI.PFNWRITE fdiWriteStreamHandler;
+        private NativeMethods.FDI.PFNCLOSE fdiCloseStreamHandler;
+        private NativeMethods.FDI.PFNSEEK fdiSeekStreamHandler;
+
+        private IUnpackStreamContext context;
+
+        private List<ArchiveFileInfo> fileList;
+
+        private int folderId;
+
+        private Predicate<string> filter;
+
+        public CabUnpacker(CabEngine cabEngine)
+            : base(cabEngine)
+        {
+            this.fdiAllocMemHandler = this.CabAllocMem;
+            this.fdiFreeMemHandler = this.CabFreeMem;
+            this.fdiOpenStreamHandler = this.CabOpenStream;
+            this.fdiReadStreamHandler = this.CabReadStream;
+            this.fdiWriteStreamHandler = this.CabWriteStream;
+            this.fdiCloseStreamHandler = this.CabCloseStream;
+            this.fdiSeekStreamHandler = this.CabSeekStream;
+
+            this.fdiHandle = NativeMethods.FDI.Create(
+                this.fdiAllocMemHandler,
+                this.fdiFreeMemHandler,
+                this.fdiOpenStreamHandler,
+                this.fdiReadStreamHandler,
+                this.fdiWriteStreamHandler,
+                this.fdiCloseStreamHandler,
+                this.fdiSeekStreamHandler,
+                NativeMethods.FDI.CPU_80386,
+                this.ErfHandle.AddrOfPinnedObject());
+            if (this.Erf.Error)
+            {
+                int error = this.Erf.Oper;
+                int errorCode = this.Erf.Type;
+                this.ErfHandle.Free();
+                throw new CabException(
+                    error,
+                    errorCode,
+                    CabException.GetErrorMessage(error, errorCode, true));
+            }
+        }
+
+        public bool IsArchive(Stream stream)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException("stream");
+            }
+
+            lock (this)
+            {
+                short id;
+                int folderCount, fileCount;
+                return this.IsCabinet(stream, out id, out folderCount, out fileCount);
+            }
+        }
+
+        public IList<ArchiveFileInfo> GetFileInfo(
+            IUnpackStreamContext streamContext,
+            Predicate<string> fileFilter)
+        {
+            if (streamContext == null)
+            {
+                throw new ArgumentNullException("streamContext");
+            }
+
+            lock (this)
+            {
+                this.context = streamContext;
+                this.filter = fileFilter;
+                this.NextCabinetName = String.Empty;
+                this.fileList = new List<ArchiveFileInfo>();
+                bool tmpSuppress = this.SuppressProgressEvents;
+                this.SuppressProgressEvents = true;
+                try
+                {
+                    for (short cabNumber = 0;
+                         this.NextCabinetName != null;
+                         cabNumber++)
+                    {
+                        this.Erf.Clear();
+                        this.CabNumbers[this.NextCabinetName] = cabNumber;
+                        
+                        NativeMethods.FDI.Copy(
+                            this.fdiHandle,
+                            this.NextCabinetName,
+                            String.Empty,
+                            0,
+                            this.CabListNotify,
+                            IntPtr.Zero,
+                            IntPtr.Zero);
+                        this.CheckError(true);
+                    }
+
+                    List<ArchiveFileInfo> tmpFileList = this.fileList;
+                    this.fileList = null;
+                    return tmpFileList.AsReadOnly();
+                }
+                finally
+                {
+                    this.SuppressProgressEvents = tmpSuppress;
+
+                    if (this.CabStream != null)
+                    {
+                        this.context.CloseArchiveReadStream(
+                            this.currentArchiveNumber,
+                            this.currentArchiveName,
+                            this.CabStream);
+                        this.CabStream = null;
+                    }
+
+                    this.context = null;
+                }
+            }
+        }
+
+        public void Unpack(
+            IUnpackStreamContext streamContext,
+            Predicate<string> fileFilter)
+        {
+            lock (this)
+            {
+                IList<ArchiveFileInfo> files =
+                    this.GetFileInfo(streamContext, fileFilter);
+
+                this.ResetProgressData();
+
+                if (files != null)
+                {
+                    this.totalFiles = files.Count;
+
+                    for (int i = 0; i < files.Count; i++)
+                    {
+                        this.totalFileBytes += files[i].Length;
+                        if (files[i].ArchiveNumber >= this.totalArchives)
+                        {
+                            int totalArchives = files[i].ArchiveNumber + 1;
+                            this.totalArchives = (short) totalArchives;
+                        }
+                    }
+                }
+
+                this.context = streamContext;
+                this.fileList = null;
+                this.NextCabinetName = String.Empty;
+                this.folderId = -1;
+                this.currentFileNumber = -1;
+
+                try
+                {
+                    for (short cabNumber = 0;
+                         this.NextCabinetName != null;
+                         cabNumber++)
+                    {
+                        this.Erf.Clear();
+                        this.CabNumbers[this.NextCabinetName] = cabNumber;
+
+                        NativeMethods.FDI.Copy(
+                            this.fdiHandle,
+                            this.NextCabinetName,
+                            String.Empty,
+                            0,
+                            this.CabExtractNotify,
+                            IntPtr.Zero,
+                            IntPtr.Zero);
+                        this.CheckError(true);
+                    }
+                }
+                finally
+                {
+                    if (this.CabStream != null)
+                    {
+                        this.context.CloseArchiveReadStream(
+                            this.currentArchiveNumber,
+                            this.currentArchiveName,
+                            this.CabStream);
+                        this.CabStream = null;
+                    }
+
+                    if (this.FileStream != null)
+                    {
+                        this.context.CloseFileWriteStream(this.currentFileName, this.FileStream, FileAttributes.Normal, DateTime.Now);
+                        this.FileStream = null;
+                    }
+
+                    this.context = null;
+                }
+            }
+        }
+
+        internal override int CabOpenStreamEx(string path, int openFlags, int shareMode, out int err, IntPtr pv)
+        {
+            if (this.CabNumbers.ContainsKey(path))
+            {
+                Stream stream = this.CabStream;
+                if (stream == null)
+                {
+                    short cabNumber = this.CabNumbers[path];
+
+                    stream = this.context.OpenArchiveReadStream(cabNumber, path, this.CabEngine);
+                    if (stream == null)
+                    {
+                        throw new FileNotFoundException(String.Format(CultureInfo.InvariantCulture, "Cabinet {0} not provided.", cabNumber));
+                    }
+                    this.currentArchiveName = path;
+                    this.currentArchiveNumber = cabNumber;
+                    if (this.totalArchives <= this.currentArchiveNumber)
+                    {
+                        int totalArchives = this.currentArchiveNumber + 1;
+                        this.totalArchives = (short) totalArchives;
+                    }
+                    this.currentArchiveTotalBytes = stream.Length;
+                    this.currentArchiveBytesProcessed = 0;
+
+                    if (this.folderId != -3)  // -3 is a special folderId that requires re-opening the same cab
+                    {
+                        this.OnProgress(ArchiveProgressType.StartArchive);
+                    }
+                    this.CabStream = stream;
+                }
+                path = CabWorker.CabStreamName;
+            }
+            return base.CabOpenStreamEx(path, openFlags, shareMode, out err, pv);
+        }
+
+        internal override int CabReadStreamEx(int streamHandle, IntPtr memory, int cb, out int err, IntPtr pv)
+        {
+            int count = base.CabReadStreamEx(streamHandle, memory, cb, out err, pv);
+            if (err == 0 && this.CabStream != null)
+            {
+                if (this.fileList == null)
+                {
+                    Stream stream = this.StreamHandles[streamHandle];
+                    if (DuplicateStream.OriginalStream(stream) ==
+                        DuplicateStream.OriginalStream(this.CabStream))
+                    {
+                        this.currentArchiveBytesProcessed += cb;
+                        if (this.currentArchiveBytesProcessed > this.currentArchiveTotalBytes)
+                        {
+                            this.currentArchiveBytesProcessed = this.currentArchiveTotalBytes;
+                        }
+                    }
+                }
+            }
+            return count;
+        }
+
+        internal override int CabWriteStreamEx(int streamHandle, IntPtr memory, int cb, out int err, IntPtr pv)
+        {
+            int count = base.CabWriteStreamEx(streamHandle, memory, cb, out err, pv);
+            if (count > 0 && err == 0)
+            {
+                this.currentFileBytesProcessed += cb;
+                this.fileBytesProcessed += cb;
+                this.OnProgress(ArchiveProgressType.PartialFile);
+            }
+            return count;
+        }
+
+        internal override int CabCloseStreamEx(int streamHandle, out int err, IntPtr pv)
+        {
+            Stream stream = DuplicateStream.OriginalStream(this.StreamHandles[streamHandle]);
+
+            if (stream == DuplicateStream.OriginalStream(this.CabStream))
+            {
+                if (this.folderId != -3)  // -3 is a special folderId that requires re-opening the same cab
+                {
+                    this.OnProgress(ArchiveProgressType.FinishArchive);
+                }
+
+                this.context.CloseArchiveReadStream(this.currentArchiveNumber, this.currentArchiveName, stream);
+
+                this.currentArchiveName = this.NextCabinetName;
+                this.currentArchiveBytesProcessed = this.currentArchiveTotalBytes = 0;
+
+                this.CabStream = null;
+            }
+            return base.CabCloseStreamEx(streamHandle, out err, pv);
+        }
+
+        /// <summary>
+        /// Disposes of resources allocated by the cabinet engine.
+        /// </summary>
+        /// <param name="disposing">If true, the method has been called directly or indirectly by a user's code,
+        /// so managed and unmanaged resources will be disposed. If false, the method has been called by the 
+        /// runtime from inside the finalizer, and only unmanaged resources will be disposed.</param>
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        protected override void Dispose(bool disposing)
+        {
+            try
+            {
+                if (disposing)
+                {
+                    if (this.fdiHandle != null)
+                    {
+                        this.fdiHandle.Dispose();
+                        this.fdiHandle = null;
+                    }
+                }
+            }
+            finally
+            {
+                base.Dispose(disposing);
+            }
+        }
+
+        private static string GetFileName(NativeMethods.FDI.NOTIFICATION notification)
+        {
+            bool utf8Name = (notification.attribs & (ushort) FileAttributes.Normal) != 0;  // _A_NAME_IS_UTF
+
+            // Non-utf8 names should be completely ASCII. But for compatibility with
+            // legacy tools, interpret them using the current (Default) ANSI codepage.
+            Encoding nameEncoding = utf8Name ? Encoding.UTF8 : Encoding.Default;
+
+            // Find how many bytes are in the string.
+            // Unfortunately there is no faster way.
+            int nameBytesCount = 0;
+            while (Marshal.ReadByte(notification.psz1, nameBytesCount) != 0)
+            {
+                nameBytesCount++;
+            }
+
+            byte[] nameBytes = new byte[nameBytesCount];
+            Marshal.Copy(notification.psz1, nameBytes, 0, nameBytesCount);
+            string name = nameEncoding.GetString(nameBytes);
+            if (Path.IsPathRooted(name))
+            {
+                name = name.Replace("" + Path.VolumeSeparatorChar, "");
+            }
+
+            return name;
+        }
+
+        private bool IsCabinet(Stream cabStream, out short id, out int cabFolderCount, out int fileCount)
+        {
+            int streamHandle = this.StreamHandles.AllocHandle(cabStream);
+            try
+            {
+                this.Erf.Clear();
+                NativeMethods.FDI.CABINFO fdici;
+                bool isCabinet = 0 != NativeMethods.FDI.IsCabinet(this.fdiHandle, streamHandle, out fdici);
+
+                if (this.Erf.Error)
+                {
+                    if (((NativeMethods.FDI.ERROR) this.Erf.Oper) == NativeMethods.FDI.ERROR.UNKNOWN_CABINET_VERSION)
+                    {
+                        isCabinet = false;
+                    }
+                    else
+                    {
+                        throw new CabException(
+                            this.Erf.Oper,
+                            this.Erf.Type,
+                            CabException.GetErrorMessage(this.Erf.Oper, this.Erf.Type, true));
+                    }
+                }
+
+                id = fdici.setID;
+                cabFolderCount = (int) fdici.cFolders;
+                fileCount = (int) fdici.cFiles;
+                return isCabinet;
+            }
+            finally
+            {
+                this.StreamHandles.FreeHandle(streamHandle);
+            }
+        }
+
+        private int CabListNotify(NativeMethods.FDI.NOTIFICATIONTYPE notificationType, NativeMethods.FDI.NOTIFICATION notification)
+        {
+            switch (notificationType)
+            {
+                case NativeMethods.FDI.NOTIFICATIONTYPE.CABINET_INFO:
+                    {
+                        string nextCab = Marshal.PtrToStringAnsi(notification.psz1);
+                        this.NextCabinetName = (nextCab.Length != 0 ? nextCab : null);
+                        return 0;  // Continue
+                    }
+                case NativeMethods.FDI.NOTIFICATIONTYPE.PARTIAL_FILE:
+                    {
+                        // This notification can occur when examining the contents of a non-first cab file.
+                        return 0;  // Continue
+                    }
+                case NativeMethods.FDI.NOTIFICATIONTYPE.COPY_FILE:
+                    {
+                        //bool execute = (notification.attribs & (ushort) FileAttributes.Device) != 0;  // _A_EXEC
+
+                        string name = CabUnpacker.GetFileName(notification);
+
+                        if (this.filter == null || this.filter(name))
+                        {
+                            if (this.fileList != null)
+                            {
+                                FileAttributes attributes = (FileAttributes) notification.attribs &
+                                    (FileAttributes.Archive | FileAttributes.Hidden | FileAttributes.ReadOnly | FileAttributes.System);
+                                if (attributes == (FileAttributes) 0)
+                                {
+                                    attributes = FileAttributes.Normal;
+                                }
+                                DateTime lastWriteTime;
+                                CompressionEngine.DosDateAndTimeToDateTime(notification.date, notification.time, out lastWriteTime);
+                                long length = notification.cb;
+
+                                CabFileInfo fileInfo = new CabFileInfo(
+                                    name,
+                                    notification.iFolder,
+                                    notification.iCabinet,
+                                    attributes,
+                                    lastWriteTime,
+                                    length);
+                                this.fileList.Add(fileInfo);
+                                this.currentFileNumber = this.fileList.Count - 1;
+                                this.fileBytesProcessed += notification.cb;
+                            }
+                        }
+
+                        this.totalFiles++;
+                        this.totalFileBytes += notification.cb;
+                        return 0;  // Continue
+                    }
+            }
+            return 0;
+        }
+
+        private int CabExtractNotify(NativeMethods.FDI.NOTIFICATIONTYPE notificationType, NativeMethods.FDI.NOTIFICATION notification)
+        {
+            switch (notificationType)
+            {
+                case NativeMethods.FDI.NOTIFICATIONTYPE.CABINET_INFO:
+                    {
+                        if (this.NextCabinetName != null && this.NextCabinetName.StartsWith("?", StringComparison.Ordinal))
+                        {
+                            // We are just continuing the copy of a file that spanned cabinets.
+                            // The next cabinet name needs to be preserved.
+                            this.NextCabinetName = this.NextCabinetName.Substring(1);
+                        }
+                        else
+                        {
+                            string nextCab = Marshal.PtrToStringAnsi(notification.psz1);
+                            this.NextCabinetName = (nextCab.Length != 0 ? nextCab : null);
+                        }
+                        return 0;  // Continue
+                    }
+                case NativeMethods.FDI.NOTIFICATIONTYPE.NEXT_CABINET:
+                    {
+                        string nextCab = Marshal.PtrToStringAnsi(notification.psz1);
+                        this.CabNumbers[nextCab] = (short) notification.iCabinet;
+                        this.NextCabinetName = "?" + this.NextCabinetName;
+                        return 0;  // Continue
+                    }
+                case NativeMethods.FDI.NOTIFICATIONTYPE.COPY_FILE:
+                    {
+                        return this.CabExtractCopyFile(notification);
+                    }
+                case NativeMethods.FDI.NOTIFICATIONTYPE.CLOSE_FILE_INFO:
+                    {
+                        return this.CabExtractCloseFile(notification);
+                    }
+            }
+            return 0;
+        }
+
+        private int CabExtractCopyFile(NativeMethods.FDI.NOTIFICATION notification)
+        {
+            if (notification.iFolder != this.folderId)
+            {
+                if (notification.iFolder != -3)  // -3 is a special folderId used when continuing a folder from a previous cab
+                {
+                    if (this.folderId != -1) // -1 means we just started the extraction sequence
+                    {
+                        this.currentFolderNumber++;
+                    }
+                }
+                this.folderId = notification.iFolder;
+            }
+
+            //bool execute = (notification.attribs & (ushort) FileAttributes.Device) != 0;  // _A_EXEC
+
+            string name = CabUnpacker.GetFileName(notification);
+
+            if (this.filter == null || this.filter(name))
+            {
+                this.currentFileNumber++;
+                this.currentFileName = name;
+
+                this.currentFileBytesProcessed = 0;
+                this.currentFileTotalBytes = notification.cb;
+                this.OnProgress(ArchiveProgressType.StartFile);
+
+                DateTime lastWriteTime;
+                CompressionEngine.DosDateAndTimeToDateTime(notification.date, notification.time, out lastWriteTime);
+
+                Stream stream = this.context.OpenFileWriteStream(name, notification.cb, lastWriteTime);
+                if (stream != null)
+                {
+                    this.FileStream = stream;
+                    int streamHandle = this.StreamHandles.AllocHandle(stream);
+                    return streamHandle;
+                }
+                else
+                {
+                    this.fileBytesProcessed += notification.cb;
+                    this.OnProgress(ArchiveProgressType.FinishFile);
+                    this.currentFileName = null;
+                }
+            }
+            return 0;  // Continue
+        }
+
+        private int CabExtractCloseFile(NativeMethods.FDI.NOTIFICATION notification)
+        {
+            Stream stream = this.StreamHandles[notification.hf];
+            this.StreamHandles.FreeHandle(notification.hf);
+
+            //bool execute = (notification.attribs & (ushort) FileAttributes.Device) != 0;  // _A_EXEC
+
+            string name = CabUnpacker.GetFileName(notification);
+
+            FileAttributes attributes = (FileAttributes) notification.attribs &
+                (FileAttributes.Archive | FileAttributes.Hidden | FileAttributes.ReadOnly | FileAttributes.System);
+            if (attributes == (FileAttributes) 0)
+            {
+                attributes = FileAttributes.Normal;
+            }
+            DateTime lastWriteTime;
+            CompressionEngine.DosDateAndTimeToDateTime(notification.date, notification.time, out lastWriteTime);
+
+            stream.Flush();
+            this.context.CloseFileWriteStream(name, stream, attributes, lastWriteTime);
+            this.FileStream = null;
+
+            long remainder = this.currentFileTotalBytes - this.currentFileBytesProcessed;
+            this.currentFileBytesProcessed += remainder;
+            this.fileBytesProcessed += remainder;
+            this.OnProgress(ArchiveProgressType.FinishFile);
+            this.currentFileName = null;
+
+            return 1;  // Continue
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/CabWorker.cs b/src/dtf/WixToolset.Dtf.Compression.Cab/CabWorker.cs
new file mode 100644
index 00000000..cb2a7263
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/CabWorker.cs
@@ -0,0 +1,337 @@
+// 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.Dtf.Compression.Cab
+{
+    using System;
+    using System.IO;
+    using System.IO.IsolatedStorage;
+    using System.Text;
+    using System.Security;
+    using System.Collections.Generic;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    internal abstract class CabWorker : IDisposable
+    {
+        internal const string CabStreamName = "%%CAB%%";
+
+        private CabEngine cabEngine;
+
+        private HandleManager<Stream> streamHandles;
+        private Stream cabStream;
+        private Stream fileStream;
+
+        private NativeMethods.ERF erf;
+        private GCHandle erfHandle;
+
+        private IDictionary<string, short> cabNumbers;
+        private string nextCabinetName;
+
+        private bool suppressProgressEvents;
+
+        private byte[] buf;
+
+        // Progress data
+        protected string currentFileName;
+        protected int    currentFileNumber;
+        protected int    totalFiles;
+        protected long   currentFileBytesProcessed;
+        protected long   currentFileTotalBytes;
+        protected short  currentFolderNumber;
+        protected long   currentFolderTotalBytes;
+        protected string currentArchiveName;
+        protected short  currentArchiveNumber;
+        protected short  totalArchives;
+        protected long   currentArchiveBytesProcessed;
+        protected long   currentArchiveTotalBytes;
+        protected long   fileBytesProcessed;
+        protected long   totalFileBytes;
+
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        protected CabWorker(CabEngine cabEngine)
+        {
+            this.cabEngine = cabEngine;
+            this.streamHandles = new HandleManager<Stream>();
+            this.erf = new NativeMethods.ERF();
+            this.erfHandle = GCHandle.Alloc(this.erf, GCHandleType.Pinned);
+            this.cabNumbers = new Dictionary<string, short>(1);
+
+            // 32K seems to be the size of the largest chunks processed by cabinet.dll.
+            // But just in case, this buffer will auto-enlarge.
+            this.buf = new byte[32768];
+        }
+
+        ~CabWorker()
+        {
+            this.Dispose(false);
+        }
+
+        public CabEngine CabEngine
+        {
+            get
+            {
+                return this.cabEngine;
+            }
+        }
+
+        internal NativeMethods.ERF Erf
+        {
+            get
+            {
+                return this.erf;
+            }
+        }
+
+        internal GCHandle ErfHandle
+        {
+            get
+            {
+                return this.erfHandle;
+            }
+        }
+
+        internal HandleManager<Stream> StreamHandles
+        {
+            get
+            {
+                return this.streamHandles;
+            }
+        }
+
+        internal bool SuppressProgressEvents
+        {
+            get
+            {
+                return this.suppressProgressEvents;
+            }
+
+            set
+            {
+                this.suppressProgressEvents = value;
+            }
+        }
+
+        internal IDictionary<string, short> CabNumbers
+        {
+            get
+            {
+                return this.cabNumbers;
+            }
+        }
+
+        internal string NextCabinetName
+        {
+            get
+            {
+                return this.nextCabinetName;
+            }
+
+            set
+            {
+                this.nextCabinetName = value;
+            }
+        }
+
+        internal Stream CabStream
+        {
+            get
+            {
+                return this.cabStream;
+            }
+
+            set
+            {
+                this.cabStream = value;
+            }
+        }
+
+        internal Stream FileStream
+        {
+            get
+            {
+                return this.fileStream;
+            }
+
+            set
+            {
+                this.fileStream = value;
+            }
+        }
+
+        public void Dispose() 
+        {
+            this.Dispose(true);
+            GC.SuppressFinalize(this); 
+        }
+
+        protected void ResetProgressData()
+        {
+            this.currentFileName = null;
+            this.currentFileNumber = 0;
+            this.totalFiles = 0;
+            this.currentFileBytesProcessed = 0;
+            this.currentFileTotalBytes = 0;
+            this.currentFolderNumber = 0;
+            this.currentFolderTotalBytes = 0;
+            this.currentArchiveName = null;
+            this.currentArchiveNumber = 0;
+            this.totalArchives = 0;
+            this.currentArchiveBytesProcessed = 0;
+            this.currentArchiveTotalBytes = 0;
+            this.fileBytesProcessed = 0;
+            this.totalFileBytes = 0;
+        }
+
+        protected void OnProgress(ArchiveProgressType progressType)
+        {
+            if (!this.suppressProgressEvents)
+            {
+                ArchiveProgressEventArgs e = new ArchiveProgressEventArgs(
+                    progressType,
+                    this.currentFileName,
+                    this.currentFileNumber >= 0 ? this.currentFileNumber : 0,
+                    this.totalFiles,
+                    this.currentFileBytesProcessed,
+                    this.currentFileTotalBytes,
+                    this.currentArchiveName,
+                    this.currentArchiveNumber,
+                    this.totalArchives,
+                    this.currentArchiveBytesProcessed,
+                    this.currentArchiveTotalBytes,
+                    this.fileBytesProcessed,
+                    this.totalFileBytes);
+                this.CabEngine.ReportProgress(e);
+            }
+        }
+
+        internal IntPtr CabAllocMem(int byteCount)
+        {
+            IntPtr memPointer = Marshal.AllocHGlobal((IntPtr) byteCount);
+            return memPointer;
+        }
+
+        internal void CabFreeMem(IntPtr memPointer)
+        {
+            Marshal.FreeHGlobal(memPointer);
+        }
+
+        internal int CabOpenStream(string path, int openFlags, int shareMode)
+        {
+            int err; return this.CabOpenStreamEx(path, openFlags, shareMode, out err, IntPtr.Zero);
+        }
+
+        internal virtual int CabOpenStreamEx(string path, int openFlags, int shareMode, out int err, IntPtr pv)
+        {
+            path = path.Trim();
+            Stream stream = this.cabStream;
+            this.cabStream = new DuplicateStream(stream);
+            int streamHandle = this.streamHandles.AllocHandle(stream);
+            err = 0;
+            return streamHandle;
+        }
+
+        internal int CabReadStream(int streamHandle, IntPtr memory, int cb)
+        {
+            int err; return this.CabReadStreamEx(streamHandle, memory, cb, out err, IntPtr.Zero);
+        }
+
+        internal virtual int CabReadStreamEx(int streamHandle, IntPtr memory, int cb, out int err, IntPtr pv)
+        {
+            Stream stream = this.streamHandles[streamHandle];
+            int count = (int) cb;
+            if (count > this.buf.Length)
+            {
+                this.buf = new byte[count];
+            }
+            count = stream.Read(this.buf, 0, count);
+            Marshal.Copy(this.buf, 0, memory, count);
+            err = 0;
+            return count;
+        }
+
+        internal int CabWriteStream(int streamHandle, IntPtr memory, int cb)
+        {
+            int err; return this.CabWriteStreamEx(streamHandle, memory, cb, out err, IntPtr.Zero);
+        }
+
+        internal virtual int CabWriteStreamEx(int streamHandle, IntPtr memory, int cb, out int err, IntPtr pv)
+        {
+            Stream stream = this.streamHandles[streamHandle];
+            int count = (int) cb;
+            if (count > this.buf.Length)
+            {
+                this.buf = new byte[count];
+            }
+            Marshal.Copy(memory, this.buf, 0, count);
+            stream.Write(this.buf, 0, count);
+            err = 0;
+            return cb;
+        }
+
+        internal int CabCloseStream(int streamHandle)
+        {
+            int err; return this.CabCloseStreamEx(streamHandle, out err, IntPtr.Zero);
+        }
+
+        internal virtual int CabCloseStreamEx(int streamHandle, out int err, IntPtr pv)
+        {
+            this.streamHandles.FreeHandle(streamHandle);
+            err = 0;
+            return 0;
+        }
+
+        internal int CabSeekStream(int streamHandle, int offset, int seekOrigin)
+        {
+            int err; return this.CabSeekStreamEx(streamHandle, offset, seekOrigin, out err, IntPtr.Zero);
+        }
+
+        internal virtual int CabSeekStreamEx(int streamHandle, int offset, int seekOrigin, out int err, IntPtr pv)
+        {
+            Stream stream = this.streamHandles[streamHandle];
+            offset = (int) stream.Seek(offset, (SeekOrigin) seekOrigin);
+            err = 0;
+            return offset;
+        }
+
+        /// <summary>
+        /// Disposes of resources allocated by the cabinet engine.
+        /// </summary>
+        /// <param name="disposing">If true, the method has been called directly or indirectly by a user's code,
+        /// so managed and unmanaged resources will be disposed. If false, the method has been called by the 
+        /// runtime from inside the finalizer, and only unmanaged resources will be disposed.</param>
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        protected virtual void Dispose(bool disposing) 
+        {
+            if (disposing) 
+            {
+                if (this.cabStream != null)
+                {
+                    this.cabStream.Close();
+                    this.cabStream = null;
+                }
+
+                if (this.fileStream != null)
+                {
+                    this.fileStream.Close();
+                    this.fileStream = null;
+                }
+            }
+
+            if (this.erfHandle.IsAllocated)
+            {
+                this.erfHandle.Free();
+            }
+        }
+
+        protected void CheckError(bool extracting)
+        {
+            if (this.Erf.Error)
+            {
+                throw new CabException(
+                    this.Erf.Oper,
+                    this.Erf.Type,
+                    CabException.GetErrorMessage(this.Erf.Oper, this.Erf.Type, extracting));
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/Errors.resources b/src/dtf/WixToolset.Dtf.Compression.Cab/Errors.resources
new file mode 100644
index 00000000..d53d263c
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/Errors.resources
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/Errors.txt b/src/dtf/WixToolset.Dtf.Compression.Cab/Errors.txt
new file mode 100644
index 00000000..df5a95d3
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/Errors.txt
@@ -0,0 +1,35 @@
+;
+; Cabinet Error Messages
+;
+
+; Generic error message.
+1=Error code: {1}
+
+;
+; Cabinet creation messages - offset by 1000
+;
+1000=Unknown error creating cabinet.
+1001=Failure opening file to be stored in cabinet.
+1002=Failure reading file to be stored in cabinet.
+1003=Could not allocate enough memory to create cabinet.
+1004=Could not create a temporary file.
+1005=Unknown compression type.
+1006=Could not create cabinet file.
+1007=Client requested abort.
+1008=Failure compressing data.
+
+;
+; Cabinet extraction messages - offset by 2000
+;
+2000=Unknown error extracting cabinet.
+2001=Cabinet not found.
+2002=Cabinet file does not have the correct format.
+2003=Cabinet file has an unknown version number.
+2004=Cabinet file is corrupt.
+2005=Could not allocate enough memory to extract cabinet.
+2006=Unknown compression type in a cabinet folder.
+2007=Failure decompressing data from a cabinet file.
+2008=Failure writing to target file.
+2009=Cabinets in a set do not have the same RESERVE sizes.
+2010=Cabinet returned on NEXT_CABINET is incorrect.
+2011=Client requested abort.
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/HandleManager.cs b/src/dtf/WixToolset.Dtf.Compression.Cab/HandleManager.cs
new file mode 100644
index 00000000..aad9a317
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/HandleManager.cs
@@ -0,0 +1,76 @@
+// 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.Dtf.Compression.Cab
+{
+    using System;
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Generic class for managing allocations of integer handles
+    /// for objects of a certain type.
+    /// </summary>
+    /// <typeparam name="T">The type of objects the handles refer to.</typeparam>
+    internal sealed class HandleManager<T> where T : class
+    {
+        /// <summary>
+        /// Auto-resizing list of objects for which handles have been allocated.
+        /// Each handle is just an index into this list. When a handle is freed,
+        /// the list item at that index is set to null.
+        /// </summary>
+        private List<T> handles;
+
+        /// <summary>
+        /// Creates a new HandleManager instance.
+        /// </summary>
+        public HandleManager()
+        {
+            this.handles = new List<T>();
+        }
+
+        /// <summary>
+        /// Gets the object of a handle, or null if the handle is invalid.
+        /// </summary>
+        /// <param name="handle">The integer handle previously allocated
+        /// for the desired object.</param>
+        /// <returns>The object for which the handle was allocated.</returns>
+        public T this[int handle]
+        {
+            get
+            {
+                if (handle > 0 && handle <= this.handles.Count)
+                {
+                    return this.handles[handle - 1];
+                }
+                else
+                {
+                    return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Allocates a new handle for an object.
+        /// </summary>
+        /// <param name="obj">Object that the handle will refer to.</param>
+        /// <returns>New handle that can be later used to retrieve the object.</returns>
+        public int AllocHandle(T obj)
+        {
+            this.handles.Add(obj);
+            int handle = this.handles.Count;
+            return handle;
+        }
+
+        /// <summary>
+        /// Frees a handle that was previously allocated. Afterward the handle
+        /// will be invalid and the object it referred to can no longer retrieved.
+        /// </summary>
+        /// <param name="handle">Handle to be freed.</param>
+        public void FreeHandle(int handle)
+        {
+            if (handle > 0 && handle <= this.handles.Count)
+            {
+                this.handles[handle - 1] = null;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/NativeMethods.cs b/src/dtf/WixToolset.Dtf.Compression.Cab/NativeMethods.cs
new file mode 100644
index 00000000..562e96dd
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/NativeMethods.cs
@@ -0,0 +1,407 @@
+// 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.Dtf.Compression.Cab
+{
+using System;
+using System.Text;
+using System.Security;
+using System.Runtime.InteropServices;
+using System.Diagnostics.CodeAnalysis;
+
+/// <summary>
+/// Native DllImport methods and related structures and constants used for
+/// cabinet creation and extraction via cabinet.dll.
+/// </summary>
+internal static class NativeMethods
+{
+    /// <summary>
+    /// A direct import of constants, enums, structures, delegates, and functions from fci.h.
+    /// Refer to comments in fci.h for documentation.
+    /// </summary>
+    internal static class FCI
+    {
+        internal const int MIN_DISK = 32768;
+        internal const int MAX_DISK = Int32.MaxValue;
+        internal const int MAX_FOLDER = 0x7FFF8000;
+        internal const int MAX_FILENAME = 256;
+        internal const int MAX_CABINET_NAME = 256;
+        internal const int MAX_CAB_PATH = 256;
+        internal const int MAX_DISK_NAME = 256;
+
+        internal const int CPU_80386 = 1;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate IntPtr PFNALLOC(int cb);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate void PFNFREE(IntPtr pv);
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNOPEN(string path, int oflag, int pmode, out int err, IntPtr pv);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNREAD(int fileHandle, IntPtr memory, int cb, out int err, IntPtr pv);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNWRITE(int fileHandle, IntPtr memory, int cb, out int err, IntPtr pv);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNCLOSE(int fileHandle, out int err, IntPtr pv);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNSEEK(int fileHandle, int dist, int seekType, out int err, IntPtr pv);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNDELETE(string path, out int err, IntPtr pv);
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNGETNEXTCABINET(IntPtr pccab, uint cbPrevCab, IntPtr pv);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNFILEPLACED(IntPtr pccab, string path, long fileSize, int continuation, IntPtr pv);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNGETOPENINFO(string path, out short date, out short time, out short pattribs, out int err, IntPtr pv);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNSTATUS(STATUS typeStatus, uint cb1, uint cb2, IntPtr pv);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNGETTEMPFILE(IntPtr tempNamePtr, int tempNameSize, IntPtr pv);
+
+        /// <summary>
+        /// Error codes that can be returned by FCI.
+        /// </summary>
+        internal enum ERROR : int
+        {
+            NONE,
+            OPEN_SRC,
+            READ_SRC,
+            ALLOC_FAIL,
+            TEMP_FILE,
+            BAD_COMPR_TYPE,
+            CAB_FILE,
+            USER_ABORT,
+            MCI_FAIL,
+        }
+
+        /// <summary>
+        /// FCI compression algorithm types and parameters.
+        /// </summary>
+        internal enum TCOMP : ushort
+        {
+            MASK_TYPE           = 0x000F,
+            TYPE_NONE           = 0x0000,
+            TYPE_MSZIP          = 0x0001,
+            TYPE_QUANTUM        = 0x0002,
+            TYPE_LZX            = 0x0003,
+            BAD                 = 0x000F,
+
+            MASK_LZX_WINDOW     = 0x1F00,
+            LZX_WINDOW_LO       = 0x0F00,
+            LZX_WINDOW_HI       = 0x1500,
+            SHIFT_LZX_WINDOW    = 0x0008,
+
+            MASK_QUANTUM_LEVEL  = 0x00F0,
+            QUANTUM_LEVEL_LO    = 0x0010,
+            QUANTUM_LEVEL_HI    = 0x0070,
+            SHIFT_QUANTUM_LEVEL = 0x0004,
+
+            MASK_QUANTUM_MEM    = 0x1F00,
+            QUANTUM_MEM_LO      = 0x0A00,
+            QUANTUM_MEM_HI      = 0x1500,
+            SHIFT_QUANTUM_MEM   = 0x0008,
+
+            MASK_RESERVED       = 0xE000,
+        }
+
+        /// <summary>
+        /// Reason for FCI status callback.
+        /// </summary>
+        internal enum STATUS : uint
+        {
+            FILE    = 0,
+            FOLDER  = 1,
+            CABINET = 2,
+        }
+
+        [SuppressMessage("Microsoft.Globalization", "CA2101:SpecifyMarshalingForPInvokeStringArguments")]
+        [DllImport("cabinet.dll", EntryPoint = "FCICreate", CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern Handle Create(IntPtr perf, PFNFILEPLACED pfnfcifp, PFNALLOC pfna, PFNFREE pfnf, PFNOPEN pfnopen, PFNREAD pfnread, PFNWRITE pfnwrite, PFNCLOSE pfnclose, PFNSEEK pfnseek, PFNDELETE pfndelete, PFNGETTEMPFILE pfnfcigtf, [MarshalAs(UnmanagedType.LPStruct)] CCAB pccab, IntPtr pv);
+
+        [DllImport("cabinet.dll", EntryPoint = "FCIAddFile", CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int AddFile(Handle hfci, string pszSourceFile, IntPtr pszFileName, [MarshalAs(UnmanagedType.Bool)] bool fExecute, PFNGETNEXTCABINET pfnfcignc, PFNSTATUS pfnfcis, PFNGETOPENINFO pfnfcigoi, TCOMP typeCompress);
+
+        [DllImport("cabinet.dll", EntryPoint = "FCIFlushCabinet", CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int FlushCabinet(Handle hfci, [MarshalAs(UnmanagedType.Bool)] bool fGetNextCab, PFNGETNEXTCABINET pfnfcignc, PFNSTATUS pfnfcis);
+
+        [DllImport("cabinet.dll", EntryPoint = "FCIFlushFolder", CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int FlushFolder(Handle hfci, PFNGETNEXTCABINET pfnfcignc, PFNSTATUS pfnfcis);
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport("cabinet.dll", EntryPoint = "FCIDestroy", CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool Destroy(IntPtr hfci);
+
+        /// <summary>
+        /// Cabinet information structure used for FCI initialization and GetNextCabinet callback.
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+        internal class CCAB
+        {
+            internal int cb             = MAX_DISK;
+            internal int cbFolderThresh = MAX_FOLDER;
+            internal int cbReserveCFHeader;
+            internal int cbReserveCFFolder;
+            internal int cbReserveCFData;
+            internal int iCab;
+            internal int iDisk;
+            internal int fFailOnIncompressible;
+            internal short setID;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst=MAX_DISK_NAME   )] internal string szDisk    = String.Empty;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst=MAX_CABINET_NAME)] internal string szCab     = String.Empty;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst=MAX_CAB_PATH    )] internal string szCabPath = String.Empty;
+        }
+
+        /// <summary>
+        /// Ensures that the FCI handle is safely released.
+        /// </summary>
+        internal class Handle : SafeHandle
+        {
+            /// <summary>
+            /// Creates a new unintialized handle. The handle will be initialized
+            /// when it is marshalled back from native code.
+            /// </summary>
+            internal Handle()
+                : base(IntPtr.Zero, true)
+            {
+            }
+
+            /// <summary>
+            /// Checks if the handle is invalid. An FCI handle is invalid when it is zero.
+            /// </summary>
+            public override bool IsInvalid
+            {
+                get
+                {
+                    return this.handle == IntPtr.Zero;
+                }
+            }
+
+            /// <summary>
+            /// Releases the handle by calling FDIDestroy().
+            /// </summary>
+            /// <returns>True if the release succeeded.</returns>
+            protected override bool ReleaseHandle()
+            {
+                return FCI.Destroy(this.handle);
+            }
+        }
+    }
+
+    /// <summary>
+    /// A direct import of constants, enums, structures, delegates, and functions from fdi.h.
+    /// Refer to comments in fdi.h for documentation.
+    /// </summary>
+    internal static class FDI
+    {
+        internal const int MAX_DISK         = Int32.MaxValue;
+        internal const int MAX_FILENAME     = 256;
+        internal const int MAX_CABINET_NAME = 256;
+        internal const int MAX_CAB_PATH     = 256;
+        internal const int MAX_DISK_NAME    = 256;
+
+        internal const int CPU_80386 = 1;
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate IntPtr PFNALLOC(int cb);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate void PFNFREE(IntPtr pv);
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNOPEN(string path, int oflag, int pmode);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNREAD(int hf, IntPtr pv, int cb);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNWRITE(int hf, IntPtr pv, int cb);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNCLOSE(int hf);
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNSEEK(int hf, int dist, int seektype);
+
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)] internal delegate int PFNNOTIFY(NOTIFICATIONTYPE fdint, NOTIFICATION fdin);
+
+        /// <summary>
+        /// Error codes that can be returned by FDI.
+        /// </summary>
+        internal enum ERROR : int
+        {
+            NONE,
+            CABINET_NOT_FOUND,
+            NOT_A_CABINET,
+            UNKNOWN_CABINET_VERSION,
+            CORRUPT_CABINET,
+            ALLOC_FAIL,
+            BAD_COMPR_TYPE,
+            MDI_FAIL,
+            TARGET_FILE,
+            RESERVE_MISMATCH,
+            WRONG_CABINET,
+            USER_ABORT,
+        }
+
+        /// <summary>
+        /// Type of notification message for the FDI Notify callback.
+        /// </summary>
+        internal enum NOTIFICATIONTYPE : int
+        {
+            CABINET_INFO,
+            PARTIAL_FILE,
+            COPY_FILE,
+            CLOSE_FILE_INFO,
+            NEXT_CABINET,
+            ENUMERATE,
+        }
+
+        [DllImport("cabinet.dll", EntryPoint = "FDICreate", CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern Handle Create([MarshalAs(UnmanagedType.FunctionPtr)] PFNALLOC pfnalloc, [MarshalAs(UnmanagedType.FunctionPtr)] PFNFREE pfnfree, PFNOPEN pfnopen, PFNREAD pfnread, PFNWRITE pfnwrite, PFNCLOSE pfnclose, PFNSEEK pfnseek, int cpuType, IntPtr perf);
+
+        [DllImport("cabinet.dll", EntryPoint = "FDICopy", CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int Copy(Handle hfdi, string pszCabinet, string pszCabPath, int flags, PFNNOTIFY pfnfdin, IntPtr pfnfdid, IntPtr pvUser);
+
+        [SuppressUnmanagedCodeSecurity]
+        [DllImport("cabinet.dll", EntryPoint = "FDIDestroy", CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, CallingConvention = CallingConvention.Cdecl)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool Destroy(IntPtr hfdi);
+
+        [DllImport("cabinet.dll", EntryPoint = "FDIIsCabinet", CharSet = CharSet.Ansi, BestFitMapping = false, ThrowOnUnmappableChar = true, CallingConvention = CallingConvention.Cdecl)]
+        [SuppressMessage("Microsoft.Portability", "CA1901:PInvokeDeclarationsShouldBePortable", Justification="FDI file handles definitely remain 4 bytes on 64bit platforms.")]
+        internal static extern int IsCabinet(Handle hfdi, int hf, out CABINFO pfdici);
+
+        /// <summary>
+        /// Cabinet information structure filled in by FDI IsCabinet.
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct CABINFO
+        {
+            internal int cbCabinet;
+            internal short cFolders;
+            internal short cFiles;
+            internal short setID;
+            internal short iCabinet;
+            internal int fReserve;
+            internal int hasprev;
+            internal int hasnext;
+        }
+
+        /// <summary>
+        /// Cabinet notification details passed to the FDI Notify callback.
+        /// </summary>
+        [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+        internal class NOTIFICATION
+        {
+            internal int cb;
+            internal IntPtr psz1;
+            internal IntPtr psz2;
+            internal IntPtr psz3;
+            internal IntPtr pv;
+
+            internal IntPtr hf_ptr;
+
+            internal short date;
+            internal short time;
+            internal short attribs;
+            internal short setID;
+            internal short iCabinet;
+            internal short iFolder;
+            internal int fdie;
+
+            // Unlike all the other file handles in FCI/FDI, this one is
+            // actually pointer-sized. Use a property to pretend it isn't.
+            internal int hf
+            {
+                get { return (int) this.hf_ptr; }
+            }
+        }
+
+        /// <summary>
+        /// Ensures that the FDI handle is safely released.
+        /// </summary>
+        internal class Handle : SafeHandle
+        {
+            /// <summary>
+            /// Creates a new unintialized handle. The handle will be initialized
+            /// when it is marshalled back from native code.
+            /// </summary>
+            internal Handle()
+                : base(IntPtr.Zero, true)
+            {
+            }
+
+            /// <summary>
+            /// Checks if the handle is invalid. An FDI handle is invalid when it is zero.
+            /// </summary>
+            public override bool IsInvalid
+            {
+                get
+                {
+                    return this.handle == IntPtr.Zero;
+                }
+            }
+
+            /// <summary>
+            /// Releases the handle by calling FDIDestroy().
+            /// </summary>
+            /// <returns>True if the release succeeded.</returns>
+            protected override bool ReleaseHandle()
+            {
+                return FDI.Destroy(this.handle);
+            }
+        }
+    }
+
+    /// <summary>
+    /// Error info structure for FCI and FDI.
+    /// </summary>
+    /// <remarks>Before being passed to FCI or FDI, this structure is
+    /// pinned in memory via a GCHandle. The pinning is necessary
+    /// to be able to read the results, since the ERF structure doesn't
+    /// get marshalled back out after an error.</remarks>
+    [StructLayout(LayoutKind.Sequential)]
+    internal class ERF
+    {
+        private int erfOper;
+        private int erfType;
+        private int fError;
+
+        /// <summary>
+        /// Gets or sets the cabinet error code.
+        /// </summary>
+        internal int Oper
+        {
+            get
+            {
+                return this.erfOper;
+            }
+
+            set
+            {
+                this.erfOper = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the Win32 error code.
+        /// </summary>
+        internal int Type
+        {
+            get
+            {
+                return this.erfType;
+            }
+
+            set
+            {
+                this.erfType = value;
+            }
+        }
+
+        /// <summary>
+        /// GCHandle doesn't like the bool type, so use an int underneath.
+        /// </summary>
+        internal bool Error
+        {
+            get
+            {
+                return this.fError != 0;
+            }
+
+            set
+            {
+                this.fError = value ? 1 : 0;
+            }
+        }
+
+        /// <summary>
+        /// Clears the error information.
+        /// </summary>
+        internal void Clear()
+        {
+            this.Oper = 0;
+            this.Type = 0;
+            this.Error = false;
+        }
+    }
+}
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
new file mode 100644
index 00000000..6b2c8cf8
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Cab/WixToolset.Dtf.Compression.Cab.csproj
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>WixToolset.Dtf.Compression.Cab</RootNamespace>
+    <AssemblyName>WixToolset.Dtf.Compression.Cab</AssemblyName>
+    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <Description>Managed libraries for cabinet archive packing and unpacking</Description>
+    <CreateDocumentationFile>true</CreateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="Errors.txt" />
+    <EmbeddedResource Include="Errors.resources" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/AssemblyInfo.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/AssemblyInfo.cs
new file mode 100644
index 00000000..f782bbb8
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+// 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.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Microsoft.Design", "CA1020:AvoidNamespacesWithFewTypes", Scope = "namespace", Target = "WixToolset.Dtf.Compression.Zip")]
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/ConcatStream.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/ConcatStream.cs
new file mode 100644
index 00000000..20d675d9
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/ConcatStream.cs
@@ -0,0 +1,157 @@
+// 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.Dtf.Compression.Zip
+{
+    using System;
+    using System.IO;
+
+    /// <summary>
+    /// Used to trick a DeflateStream into reading from or writing to
+    /// a series of (chunked) streams instead of a single steream.
+    /// </summary>
+    internal class ConcatStream : Stream
+    {
+        private Stream source;
+        private long position;
+        private long length;
+        private Action<ConcatStream> nextStreamHandler;
+
+        public ConcatStream(Action<ConcatStream> nextStreamHandler)
+        {
+            if (nextStreamHandler == null)
+            {
+                throw new ArgumentNullException("nextStreamHandler");
+            }
+
+            this.nextStreamHandler = nextStreamHandler;
+            this.length = Int64.MaxValue;
+        }
+
+        public Stream Source
+        {
+            get { return this.source; }
+            set { this.source = value; }
+        }
+
+        public override bool CanRead
+        {
+            get { return true; }
+        }
+
+        public override bool CanWrite
+        {
+            get { return true; }
+        }
+
+        public override bool CanSeek
+        {
+            get { return false; }
+        }
+
+        public override long Length
+        {
+            get
+            {
+                return this.length;
+            }
+        }
+
+        public override long Position
+        {
+            get { return this.position; }
+            set { throw new NotSupportedException(); }
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            if (this.source == null)
+            {
+                this.nextStreamHandler(this);
+            }
+
+            count = (int) Math.Min(count, this.length - this.position);
+
+            int bytesRemaining = count;
+            while (bytesRemaining > 0)
+            {
+                if (this.source == null)
+                {
+                    throw new InvalidOperationException();
+                }
+
+                int partialCount = (int) Math.Min(bytesRemaining,
+                    this.source.Length - this.source.Position);
+
+                if (partialCount == 0)
+                {
+                    this.nextStreamHandler(this);
+                    continue;
+                }
+
+                partialCount = this.source.Read(
+                    buffer, offset + count - bytesRemaining, partialCount);
+                bytesRemaining -= partialCount;
+                this.position += partialCount;
+            }
+
+            return count;
+        }
+
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            if (this.source == null)
+            {
+                this.nextStreamHandler(this);
+            }
+
+            int bytesRemaining = count;
+            while (bytesRemaining > 0)
+            {
+                if (this.source == null)
+                {
+                    throw new InvalidOperationException();
+                }
+
+                int partialCount = (int) Math.Min(bytesRemaining,
+                    Math.Max(0, this.length - this.source.Position));
+
+                if (partialCount == 0)
+                {
+                    this.nextStreamHandler(this);
+                    continue;
+                }
+
+                this.source.Write(
+                    buffer, offset + count - bytesRemaining, partialCount);
+                bytesRemaining -= partialCount;
+                this.position += partialCount;
+            }
+        }
+
+        public override void Flush()
+        {
+            if (this.source != null)
+            {
+                this.source.Flush();
+            }
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void SetLength(long value)
+        {
+            this.length = value;
+        }
+
+        public override void Close()
+        {
+            if (this.source != null)
+            {
+                this.source.Close();
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/CrcStream.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/CrcStream.cs
new file mode 100644
index 00000000..c645ecc1
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/CrcStream.cs
@@ -0,0 +1,250 @@
+// 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.Dtf.Compression.Zip
+{
+    using System;
+    using System.IO;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Wraps a source stream and calcaluates a CRC over all bytes that are read or written.
+    /// </summary>
+    /// <remarks>
+    /// The CRC algorithm matches that used in the standard ZIP file format.
+    /// </remarks>
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Crc")]
+    public class CrcStream : Stream
+    {
+        private Stream source;
+        private uint crc;
+
+        /// <summary>
+        /// Creates a new CrcStream instance from a source stream.
+        /// </summary>
+        /// <param name="source">Underlying stream where bytes will be read from or written to.</param>
+        public CrcStream(Stream source)
+        {
+            this.source = source;
+        }
+
+        /// <summary>
+        /// Gets the current CRC over all bytes that have been read or written
+        /// since this instance was created.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Crc")]
+        public uint Crc
+        {
+            get
+            {
+                return this.crc;
+            }
+        }
+
+        /// <summary>
+        /// Gets the underlying stream that this stream reads from or writes to.
+        /// </summary>
+        public Stream Source
+        {
+            get
+            {
+                return this.source;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports reading.
+        /// </summary>
+        /// <value>true if the stream supports reading; otherwise, false.</value>
+        public override bool CanRead
+        {
+            get
+            {
+                return this.source.CanRead;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports writing.
+        /// </summary>
+        /// <value>true if the stream supports writing; otherwise, false.</value>
+        public override bool CanWrite
+        {
+            get
+            {
+                return this.source.CanWrite;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports seeking.
+        /// </summary>
+        /// <value>true if the stream supports seeking; otherwise, false.</value>
+        public override bool CanSeek
+        {
+            get
+            {
+                return this.source.CanSeek;
+            }
+        }
+
+        /// <summary>
+        /// Gets the length of the source stream.
+        /// </summary>
+        public override long Length
+        {
+            get
+            {
+                return this.source.Length;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the position of the source stream.
+        /// </summary>
+        public override long Position
+        {
+            get
+            {
+                return this.source.Position;
+            }
+
+            set
+            {
+                this.source.Position = value;
+            }
+        }
+
+        /// <summary>
+        /// Sets the position within the source stream.
+        /// </summary>
+        /// <param name="offset">A byte offset relative to the origin parameter.</param>
+        /// <param name="origin">A value of type SeekOrigin indicating
+        /// the reference point used to obtain the new position.</param>
+        /// <returns>The new position within the source stream.</returns>
+        /// <remarks>
+        /// Note the CRC is only calculated over bytes that are actually read or
+        /// written, so any bytes skipped by seeking will not contribute to the CRC.
+        /// </remarks>
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            return this.source.Seek(offset, origin);
+        }
+
+        /// <summary>
+        /// Sets the length of the source stream.
+        /// </summary>
+        /// <param name="value">The desired length of the
+        /// stream in bytes.</param>
+        public override void SetLength(long value)
+        {
+            this.source.SetLength(value);
+        }
+
+        /// <summary>
+        /// Reads a sequence of bytes from the source stream and advances
+        /// the position within the stream by the number of bytes read.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. When this method returns, the buffer
+        /// contains the specified byte array with the values between offset and
+        /// (offset + count - 1) replaced by the bytes read from the current source.</param>
+        /// <param name="offset">The zero-based byte offset in buffer at which to begin
+        /// storing the data read from the current stream.</param>
+        /// <param name="count">The maximum number of bytes to be read from the current stream.</param>
+        /// <returns>The total number of bytes read into the buffer. This can be less
+        /// than the number of bytes requested if that many bytes are not currently available,
+        /// or zero (0) if the end of the stream has been reached.</returns>
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            count = this.source.Read(buffer, offset, count);
+            this.UpdateCrc(buffer, offset, count);
+            return count;
+        }
+
+        /// <summary>
+        /// Writes a sequence of bytes to the source stream and advances the
+        /// current position within this stream by the number of bytes written.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. This method copies count
+        /// bytes from buffer to the current stream.</param>
+        /// <param name="offset">The zero-based byte offset in buffer at which
+        /// to begin copying bytes to the current stream.</param>
+        /// <param name="count">The number of bytes to be written to the
+        /// current stream.</param>
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            this.source.Write(buffer, offset, count);
+            this.UpdateCrc(buffer, offset, count);
+        }
+
+        /// <summary>
+        /// Flushes the source stream.
+        /// </summary>
+        public override void Flush()
+        {
+            this.source.Flush();
+        }
+
+        /// <summary>
+        /// Closes the underlying stream.
+        /// </summary>
+        public override void Close()
+        {
+            this.source.Close();
+            base.Close();
+        }
+
+        /// <summary>
+        /// Updates the CRC with a range of bytes that were read or written.
+        /// </summary>
+        private void UpdateCrc(byte[] buffer, int offset, int count)
+        {
+            this.crc = ~this.crc;
+            for( ; count > 0; count--, offset++)
+            {
+                this.crc = (this.crc >> 8) ^
+                    CrcStream.crcTable[(this.crc  & 0xFF) ^ buffer[offset]];
+            }
+            this.crc = ~this.crc;
+        }
+
+        private static uint[] crcTable = MakeCrcTable();
+
+        /// <summary>
+        /// Computes a table that speeds up calculation of the CRC.
+        /// </summary>
+        private static uint[] MakeCrcTable()
+        {
+            const uint poly = 0x04C11DB7u;
+            uint[] crcTable = new uint[256];
+            for(uint n = 0; n < 256; n++)
+            {
+                uint c = CrcStream.Reflect(n, 8);
+                c = c << 24;
+                for(uint k = 0; k < 8; k++)
+                {
+                    c = (c << 1) ^ ((c & 0x80000000u) != 0 ? poly : 0);
+                }
+                crcTable[n] = CrcStream.Reflect(c, 32);
+            }
+            return crcTable;
+        }
+
+        /// <summary>
+        /// Reflects the ordering of certain number of bits. For exmample when reflecting
+        /// one byte, bit one is swapped with bit eight, bit two with bit seven, etc.
+        /// </summary>
+        private static uint Reflect(uint value, int bits)
+        {
+            for (int i = 0; i < bits / 2; i++)
+            {
+                uint leftBit = 1u << (bits - 1 - i);
+                uint rightBit = 1u << i;
+                if (((value & leftBit) != 0) != ((value & rightBit) != 0))
+                {
+                    value ^= leftBit | rightBit;
+                }
+            }
+            return value;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
new file mode 100644
index 00000000..2f5f2f27
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/WixToolset.Dtf.Compression.Zip.csproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>WixToolset.Dtf.Compression.Zip</RootNamespace>
+    <AssemblyName>WixToolset.Dtf.Compression.Zip</AssemblyName>
+    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <Description>Managed libraries for zip archive packing and unpacking</Description>
+    <CreateDocumentationFile>true</CreateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/ZipCompressionMethod.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipCompressionMethod.cs
new file mode 100644
index 00000000..2e1c7567
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipCompressionMethod.cs
@@ -0,0 +1,80 @@
+// 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.Dtf.Compression.Zip
+{
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Identifies the compression method or &quot;algorithm&quot;
+    /// used for a single file within a zip archive.
+    /// </summary>
+    /// <remarks>
+    /// Proprietary zip implementations may define additional compression
+    /// methods outside of those included here.
+    /// </remarks>
+    public enum ZipCompressionMethod
+    {
+        /// <summary>
+        /// The file is stored (no compression)
+        /// </summary>
+        Store = 0,
+        
+        /// <summary>
+        /// The file is Shrunk
+        /// </summary>
+        Shrink = 1,
+        
+        /// <summary>
+        /// The file is Reduced with compression factor 1
+        /// </summary>
+        Reduce1 = 2,
+
+        /// <summary>
+        /// The file is Reduced with compression factor 2
+        /// </summary>
+        Reduce2 = 3,
+
+        /// <summary>
+        /// The file is Reduced with compression factor 3
+        /// </summary>
+        Reduce3 = 4,
+
+        /// <summary>
+        /// The file is Reduced with compression factor 4
+        /// </summary>
+        Reduce4 = 5,
+        
+        /// <summary>
+        /// The file is Imploded
+        /// </summary>
+        Implode = 6,
+        
+        /// <summary>
+        /// The file is Deflated;
+        /// the most common and widely-compatible form of zip compression.
+        /// </summary>
+        Deflate = 8,
+        
+        /// <summary>
+        /// The file is Deflated using the enhanced Deflate64 method.
+        /// </summary>
+        Deflate64 = 9,
+
+        /// <summary>
+        /// The file is compressed using the BZIP2 algorithm.
+        /// </summary>
+        BZip2 = 12,
+
+        /// <summary>
+        /// The file is compressed using the LZMA algorithm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Lzma")]
+        Lzma = 14,
+
+        /// <summary>
+        /// The file is compressed using the PPMd algorithm.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ppmd")]
+        Ppmd = 98
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/ZipEngine.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipEngine.cs
new file mode 100644
index 00000000..36b4db89
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipEngine.cs
@@ -0,0 +1,478 @@
+// 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.Dtf.Compression.Zip
+{
+    using System;
+    using System.IO;
+    using System.IO.Compression;
+    using System.Collections.Generic;
+    using System.Reflection;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Engine capable of packing and unpacking archives in the zip format.
+    /// </summary>
+    public partial class ZipEngine : CompressionEngine
+    {
+        private static Dictionary<ZipCompressionMethod, Converter<Stream, Stream>>
+            compressionStreamCreators;
+        private static Dictionary<ZipCompressionMethod, Converter<Stream, Stream>>
+            decompressionStreamCreators;
+
+        private static void InitCompressionStreamCreators()
+        {
+            if (ZipEngine.compressionStreamCreators == null)
+            {
+                ZipEngine.compressionStreamCreators = new
+                    Dictionary<ZipCompressionMethod, Converter<Stream, Stream>>();
+                ZipEngine.decompressionStreamCreators = new
+                    Dictionary<ZipCompressionMethod, Converter<Stream, Stream>>();
+
+                ZipEngine.RegisterCompressionStreamCreator(
+                    ZipCompressionMethod.Store,
+                    CompressionMode.Compress,
+                    delegate(Stream stream) {
+                        return stream;
+                    });
+                ZipEngine.RegisterCompressionStreamCreator(
+                    ZipCompressionMethod.Deflate,
+                    CompressionMode.Compress,
+                    delegate(Stream stream) {
+                        return new DeflateStream(stream, CompressionMode.Compress, true);
+                    });
+                ZipEngine.RegisterCompressionStreamCreator(
+                    ZipCompressionMethod.Store,
+                    CompressionMode.Decompress,
+                    delegate(Stream stream) {
+                        return stream;
+                    });
+                ZipEngine.RegisterCompressionStreamCreator(
+                    ZipCompressionMethod.Deflate,
+                    CompressionMode.Decompress,
+                    delegate(Stream stream) {
+                        return new DeflateStream(stream, CompressionMode.Decompress, true);
+                    });
+            }
+        }
+
+        /// <summary>
+        /// Registers a delegate that can create a warpper stream for
+        /// compressing or uncompressing the data of a source stream.
+        /// </summary>
+        /// <param name="compressionMethod">Compression method being registered.</param>
+        /// <param name="compressionMode">Indicates registration for ether
+        /// compress or decompress mode.</param>
+        /// <param name="creator">Delegate being registered.</param>
+        /// <remarks>
+        /// For compression, the delegate accepts a stream that writes to the archive
+        /// and returns a wrapper stream that compresses bytes as they are written.
+        /// For decompression, the delegate accepts a stream that reads from the archive
+        /// and returns a wrapper stream that decompresses bytes as they are read.
+        /// This wrapper stream model follows the design used by
+        /// System.IO.Compression.DeflateStream, and indeed that class is used
+        /// to implement the Deflate compression method by default.
+        /// <para>To unregister a delegate, call this method again and pass
+        /// null for the delegate parameter.</para>
+        /// </remarks>
+        /// <example>
+        /// When the ZipEngine class is initialized, the Deflate compression method
+        /// is automatically registered like this:
+        /// <code>
+        ///        ZipEngine.RegisterCompressionStreamCreator(
+        ///            ZipCompressionMethod.Deflate,
+        ///            CompressionMode.Compress,
+        ///            delegate(Stream stream) {
+        ///                return new DeflateStream(stream, CompressionMode.Compress, true);
+        ///            });
+        ///        ZipEngine.RegisterCompressionStreamCreator(
+        ///            ZipCompressionMethod.Deflate,
+        ///            CompressionMode.Decompress,
+        ///            delegate(Stream stream) {
+        ///                return new DeflateStream(stream, CompressionMode.Decompress, true);
+        ///            });
+        /// </code></example>
+        public static void RegisterCompressionStreamCreator(
+            ZipCompressionMethod compressionMethod,
+            CompressionMode compressionMode,
+            Converter<Stream, Stream> creator)
+        {
+            ZipEngine.InitCompressionStreamCreators();
+            if (compressionMode == CompressionMode.Compress)
+            {
+                ZipEngine.compressionStreamCreators[compressionMethod] = creator;
+            }
+            else
+            {
+                ZipEngine.decompressionStreamCreators[compressionMethod] = creator;
+            }
+        }
+
+        // Progress data
+        private string currentFileName;
+        private int currentFileNumber;
+        private int totalFiles;
+        private long currentFileBytesProcessed;
+        private long currentFileTotalBytes;
+        private string mainArchiveName;
+        private string currentArchiveName;
+        private short currentArchiveNumber;
+        private short totalArchives;
+        private long currentArchiveBytesProcessed;
+        private long currentArchiveTotalBytes;
+        private long fileBytesProcessed;
+        private long totalFileBytes;
+        private string comment;
+
+        /// <summary>
+        /// Creates a new instance of the zip engine.
+        /// </summary>
+        public ZipEngine()
+            : base()
+        {
+            ZipEngine.InitCompressionStreamCreators();
+        }
+
+        /// <summary>
+        /// Gets the comment from the last-examined archive,
+        /// or sets the comment to be added to any created archives.
+        /// </summary>
+        public string ArchiveComment
+        {
+            get
+            {
+                return this.comment;
+            }
+            set
+            {
+                this.comment = value;
+            }
+        }
+
+        /// <summary>
+        /// Checks whether a Stream begins with a header that indicates
+        /// it is a valid archive file.
+        /// </summary>
+        /// <param name="stream">Stream for reading the archive file.</param>
+        /// <returns>True if the stream is a valid zip archive
+        /// (with no offset); false otherwise.</returns>
+        public override bool IsArchive(Stream stream)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException("stream");
+            }
+
+            if (stream.Length - stream.Position < 4)
+            {
+                return false;
+            }
+
+            BinaryReader reader = new BinaryReader(stream);
+            uint sig = reader.ReadUInt32();
+            switch (sig)
+            {
+                case ZipFileHeader.LFHSIG:
+                case ZipEndOfCentralDirectory.EOCDSIG:
+                case ZipEndOfCentralDirectory.EOCD64SIG:
+                case ZipFileHeader.SPANSIG:
+                case ZipFileHeader.SPANSIG2:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the offset of an archive that is positioned 0 or more bytes
+        /// from the start of the Stream.
+        /// </summary>
+        /// <param name="stream">A stream for reading the archive.</param>
+        /// <returns>The offset in bytes of the archive,
+        /// or -1 if no archive is found in the Stream.</returns>
+        /// <remarks>The archive must begin on a 4-byte boundary.</remarks>
+        public override long FindArchiveOffset(Stream stream)
+        {
+            long offset = base.FindArchiveOffset(stream);
+            if (offset > 0)
+            {
+                // Some self-extract packages include the exe stub in file offset calculations.
+                // Check the first header directory offset to decide whether the entire
+                // archive needs to be offset or not.
+
+                ZipEndOfCentralDirectory eocd = this.GetEOCD(null, stream);
+                if (eocd != null && eocd.totalEntries > 0)
+                {
+                    stream.Seek(eocd.dirOffset, SeekOrigin.Begin);
+
+                    ZipFileHeader header = new ZipFileHeader();
+                    if (header.Read(stream, true) && header.localHeaderOffset < stream.Length)
+                    {
+                        stream.Seek(header.localHeaderOffset, SeekOrigin.Begin);
+                        if (header.Read(stream, false))
+                        {
+                            return 0;
+                        }
+                    }
+                }
+            }
+
+            return offset;
+        }
+
+        /// <summary>
+        /// Gets information about files in a zip archive or archive chain.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of archive and file streams.</param>
+        /// <param name="fileFilter">A predicate that can determine
+        /// which files to process, optional.</param>
+        /// <returns>Information about files in the archive stream.</returns>
+        /// <exception cref="ArchiveException">The archive provided
+        /// by the stream context is not valid.</exception>
+        /// <remarks>
+        /// The <paramref name="fileFilter"/> predicate takes an internal file
+        /// path and returns true to include the file or false to exclude it.
+        /// </remarks>
+        public override IList<ArchiveFileInfo> GetFileInfo(
+            IUnpackStreamContext streamContext,
+            Predicate<string> fileFilter)
+        {
+            if (streamContext == null)
+            {
+                throw new ArgumentNullException("streamContext");
+            }
+
+            lock (this)
+            {
+                IList<ZipFileHeader> headers = this.GetCentralDirectory(streamContext);
+                if (headers == null)
+                {
+                    throw new ZipException("Zip central directory not found.");
+                }
+
+                List<ArchiveFileInfo> files = new List<ArchiveFileInfo>(headers.Count);
+                foreach (ZipFileHeader header in headers)
+                {
+                    if (!header.IsDirectory &&
+                        (fileFilter == null || fileFilter(header.fileName)))
+                    {
+                        files.Add(header.ToZipFileInfo());
+                    }
+                }
+
+                return files.AsReadOnly();
+            }
+        }
+
+        /// <summary>
+        /// Reads all the file headers from the central directory in the main archive.
+        /// </summary>
+        private IList<ZipFileHeader> GetCentralDirectory(IUnpackStreamContext streamContext)
+        {
+            Stream archiveStream = null;
+            this.currentArchiveNumber = 0;
+            try
+            {
+                List<ZipFileHeader> headers = new List<ZipFileHeader>();
+                archiveStream = this.OpenArchive(streamContext, 0);
+
+                ZipEndOfCentralDirectory eocd = this.GetEOCD(streamContext, archiveStream);
+                if (eocd == null)
+                {
+                    return null;
+                }
+                else if (eocd.totalEntries == 0)
+                {
+                    return headers;
+                }
+
+                headers.Capacity = (int) eocd.totalEntries;
+
+                if (eocd.dirOffset > archiveStream.Length - ZipFileHeader.CFH_FIXEDSIZE)
+                {
+                    streamContext.CloseArchiveReadStream(
+                        this.currentArchiveNumber, String.Empty, archiveStream);
+                    archiveStream = null;
+                }
+                else
+                {
+                    archiveStream.Seek(eocd.dirOffset, SeekOrigin.Begin);
+                    uint sig = new BinaryReader(archiveStream).ReadUInt32();
+                    if (sig != ZipFileHeader.CFHSIG)
+                    {
+                        streamContext.CloseArchiveReadStream(
+                            this.currentArchiveNumber, String.Empty, archiveStream);
+                        archiveStream = null;
+                    }
+                }
+
+                if (archiveStream == null)
+                {
+                    this.currentArchiveNumber = (short) (eocd.dirStartDiskNumber + 1);
+                    archiveStream = streamContext.OpenArchiveReadStream(
+                        this.currentArchiveNumber, String.Empty, this);
+
+                    if (archiveStream == null)
+                    {
+                        return null;
+                    }
+                }
+
+                archiveStream.Seek(eocd.dirOffset, SeekOrigin.Begin);
+
+                while (headers.Count < eocd.totalEntries)
+                {
+                    ZipFileHeader header = new ZipFileHeader();
+                    if (!header.Read(archiveStream, true))
+                    {
+                        throw new ZipException(
+                            "Missing or invalid central directory file header");
+                    }
+
+                    headers.Add(header);
+
+                    if (headers.Count < eocd.totalEntries &&
+                        archiveStream.Position == archiveStream.Length)
+                    {
+                        streamContext.CloseArchiveReadStream(
+                            this.currentArchiveNumber, String.Empty, archiveStream);
+                        this.currentArchiveNumber++;
+                        archiveStream = streamContext.OpenArchiveReadStream(
+                            this.currentArchiveNumber, String.Empty, this);
+                        if (archiveStream == null)
+                        {
+                            this.currentArchiveNumber = 0;
+                            archiveStream = streamContext.OpenArchiveReadStream(
+                                this.currentArchiveNumber, String.Empty, this);
+                        }
+                    }
+                }
+
+                return headers;
+            }
+            finally
+            {
+                if (archiveStream != null)
+                {
+                    streamContext.CloseArchiveReadStream(
+                        this.currentArchiveNumber, String.Empty, archiveStream);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Locates and reads the end of central directory record near the
+        /// end of the archive.
+        /// </summary>
+        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic")]
+        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "streamContext")]
+        private ZipEndOfCentralDirectory GetEOCD(
+            IUnpackStreamContext streamContext, Stream archiveStream)
+        {
+            BinaryReader reader = new BinaryReader(archiveStream);
+            long offset = archiveStream.Length
+                - ZipEndOfCentralDirectory.EOCD_RECORD_FIXEDSIZE;
+            while (offset >= 0)
+            {
+                archiveStream.Seek(offset, SeekOrigin.Begin);
+
+                uint sig = reader.ReadUInt32();
+                if (sig == ZipEndOfCentralDirectory.EOCDSIG)
+                {
+                    break;
+                }
+
+                offset--;
+            }
+
+            if (offset < 0)
+            {
+                return null;
+            }
+
+            ZipEndOfCentralDirectory eocd = new ZipEndOfCentralDirectory();
+            archiveStream.Seek(offset, SeekOrigin.Begin);
+            if (!eocd.Read(archiveStream))
+            {
+                throw new ZipException("Invalid end of central directory record");
+            }
+
+            if (eocd.dirOffset == (long) UInt32.MaxValue)
+            {
+                string saveComment = eocd.comment;
+
+                archiveStream.Seek(
+                    offset - Zip64EndOfCentralDirectoryLocator.EOCDL64_SIZE,
+                    SeekOrigin.Begin);
+
+                Zip64EndOfCentralDirectoryLocator eocdl =
+                    new Zip64EndOfCentralDirectoryLocator();
+                if (!eocdl.Read(archiveStream))
+                {
+                    throw new ZipException("Missing or invalid end of " +
+                        "central directory record locator");
+                }
+
+                if (eocdl.dirStartDiskNumber == eocdl.totalDisks - 1)
+                {
+                    // ZIP64 eocd is entirely in current stream.
+                    archiveStream.Seek(eocdl.dirOffset, SeekOrigin.Begin);
+                    if (!eocd.Read(archiveStream))
+                    {
+                        throw new ZipException("Missing or invalid ZIP64 end of " +
+                            "central directory record");
+                    }
+                }
+                else if (streamContext == null)
+                {
+                    return null;
+                }
+                else
+                {
+                    // TODO: handle EOCD64 spanning archives!
+                    throw new NotImplementedException("Zip implementation does not " +
+                        "handle end of central directory record that spans archives.");
+                }
+
+                eocd.comment = saveComment;
+            }
+
+            return eocd;
+        }
+
+        private void ResetProgressData()
+        {
+            this.currentFileName = null;
+            this.currentFileNumber = 0;
+            this.totalFiles = 0;
+            this.currentFileBytesProcessed = 0;
+            this.currentFileTotalBytes = 0;
+            this.currentArchiveName = null;
+            this.currentArchiveNumber = 0;
+            this.totalArchives = 0;
+            this.currentArchiveBytesProcessed = 0;
+            this.currentArchiveTotalBytes = 0;
+            this.fileBytesProcessed = 0;
+            this.totalFileBytes = 0;
+        }
+
+        private void OnProgress(ArchiveProgressType progressType)
+        {
+            ArchiveProgressEventArgs e = new ArchiveProgressEventArgs(
+                progressType,
+                this.currentFileName,
+                this.currentFileNumber >= 0 ? this.currentFileNumber : 0,
+                this.totalFiles,
+                this.currentFileBytesProcessed,
+                this.currentFileTotalBytes,
+                this.currentArchiveName,
+                this.currentArchiveNumber,
+                this.totalArchives,
+                this.currentArchiveBytesProcessed,
+                this.currentArchiveTotalBytes,
+                this.fileBytesProcessed,
+                this.totalFileBytes);
+            this.OnProgress(e);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/ZipException.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipException.cs
new file mode 100644
index 00000000..50fd6156
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipException.cs
@@ -0,0 +1,60 @@
+// 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.Dtf.Compression.Zip
+{
+    using System;
+    using System.IO;
+    using System.Resources;
+    using System.Globalization;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Exception class for zip operations.
+    /// </summary>
+    [Serializable]
+    public class ZipException : ArchiveException
+    {
+        /// <summary>
+        /// Creates a new ZipException with a specified error message and a reference to the
+        /// inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception. If the
+        /// innerException parameter is not a null reference (Nothing in Visual Basic), the current exception
+        /// is raised in a catch block that handles the inner exception.</param>
+        public ZipException(string message, Exception innerException)
+            : base(message, innerException) { }
+
+        /// <summary>
+        /// Creates a new ZipException with a specified error message.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public ZipException(string message)
+            : this(message, null) { }
+
+        /// <summary>
+        /// Creates a new ZipException.
+        /// </summary>
+        public ZipException()
+            : this(null, null) { }
+
+        /// <summary>
+        /// Initializes a new instance of the ZipException class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected ZipException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Sets the SerializationInfo with information about the exception.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/ZipFileInfo.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipFileInfo.cs
new file mode 100644
index 00000000..d865bbba
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipFileInfo.cs
@@ -0,0 +1,104 @@
+// 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.Dtf.Compression.Zip
+{
+    using System;
+    using System.IO;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Object representing a compressed file within a zip package; provides operations for getting
+    /// the file properties and extracting the file.
+    /// </summary>
+    [Serializable]
+    public class ZipFileInfo : ArchiveFileInfo
+    {
+        private long compressedLength;
+        private ZipCompressionMethod compressionMethod;
+
+        /// <summary>
+        /// Creates a new ZipFileInfo object representing a file within a zip in a specified path.
+        /// </summary>
+        /// <param name="zipInfo">An object representing the zip archive containing the file.</param>
+        /// <param name="filePath">The path to the file within the zip archive. Usually, this is a simple file
+        /// name, but if the zip archive contains a directory structure this may include the directory.</param>
+        public ZipFileInfo(ZipInfo zipInfo, string filePath)
+            : base(zipInfo, filePath)
+        {
+            if (zipInfo == null)
+            {
+                throw new ArgumentNullException("zipInfo");
+            }
+        }
+
+        /// <summary>
+        /// Creates a new ZipFileInfo object with all parameters specified,
+        /// used internally when reading the metadata out of a zip archive.
+        /// </summary>
+        /// <param name="filePath">The internal path and name of the file in the zip archive.</param>
+        /// <param name="zipNumber">The zip archive number where the file starts.</param>
+        /// <param name="attributes">The stored attributes of the file.</param>
+        /// <param name="lastWriteTime">The stored last write time of the file.</param>
+        /// <param name="length">The uncompressed size of the file.</param>
+        /// <param name="compressedLength">The compressed size of the file.</param>
+        /// <param name="compressionMethod">Compression algorithm used for this file.</param>
+        internal ZipFileInfo(
+            string filePath,
+            int zipNumber,
+            FileAttributes attributes,
+            DateTime lastWriteTime,
+            long length,
+            long compressedLength,
+            ZipCompressionMethod compressionMethod)
+            : base(filePath, zipNumber, attributes, lastWriteTime, length)
+        {
+            this.compressedLength = compressedLength;
+            this.compressionMethod = compressionMethod;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ZipFileInfo class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected ZipFileInfo(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+            this.compressedLength = info.GetInt64("compressedLength");
+        }
+
+        /// <summary>
+        /// Gets the compressed size of the file in bytes.
+        /// </summary>
+        public long CompressedLength
+        {
+            get
+            {
+                return this.compressedLength;
+            }
+        }
+
+        /// <summary>
+        /// Gets the method used to compress this file.
+        /// </summary>
+        public ZipCompressionMethod CompressionMethod
+        {
+            get
+            {
+                return this.compressionMethod;
+            }
+        }
+
+        /// <summary>
+        /// Sets the SerializationInfo with information about the archive.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data.</param>
+        /// <param name="context">The StreamingContext that contains contextual information
+        /// about the source or destination.</param>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+            info.AddValue("compressedLength", this.compressedLength);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/ZipFormat.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipFormat.cs
new file mode 100644
index 00000000..dc5e1137
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipFormat.cs
@@ -0,0 +1,697 @@
+// 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.Dtf.Compression.Zip
+{
+    using System;
+    using System.Globalization;
+    using System.IO;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+
+    [Flags]
+    internal enum ZipFileFlags : ushort
+    {
+        None            = 0x0000,
+        Encrypt         = 0x0001,
+        CompressOption1 = 0x0002,
+        CompressOption2 = 0x0004,
+        DataDescriptor  = 0x0008,
+        StrongEncrypt   = 0x0040,
+        UTF8            = 0x0800
+    }
+
+    internal enum ZipExtraFileFieldType : ushort
+    {
+        ZIP64 = 0x0001,
+        NTFS_TIMES = 0x000A,
+        NTFS_ACLS = 0x4453,
+        EXTIME = 0x5455
+    }
+
+    internal class ZipFileHeader
+    {
+        public const uint LFHSIG = 0x04034B50;
+        public const uint CFHSIG = 0x02014B50;
+
+        public const uint SPANSIG  = 0x08074b50;
+        public const uint SPANSIG2 = 0x30304b50;
+        
+        public const uint LFH_FIXEDSIZE = 30;
+        public const uint CFH_FIXEDSIZE = 46;
+
+        public ushort versionMadeBy;
+        public ushort versionNeeded;
+        public ZipFileFlags flags;
+        public ZipCompressionMethod compressionMethod;
+        public short lastModTime;
+        public short lastModDate;
+        public uint crc32;
+        public uint compressedSize;
+        public uint uncompressedSize;
+        public ushort diskStart;
+        public ushort internalFileAttrs;
+        public uint externalFileAttrs;
+        public uint localHeaderOffset;
+        public string fileName;
+        public ZipExtraFileField[] extraFields;
+        public string fileComment;
+        public bool zip64;
+
+        public ZipFileHeader()
+        {
+            this.versionMadeBy = 20;
+            this.versionNeeded = 20;
+        }
+
+        public ZipFileHeader(ZipFileInfo fileInfo, bool zip64)
+            : this()
+        {
+            this.flags = ZipFileFlags.None;
+            this.compressionMethod = fileInfo.CompressionMethod;
+            this.fileName = Path.Combine(fileInfo.Path, fileInfo.Name);
+            CompressionEngine.DateTimeToDosDateAndTime(
+                fileInfo.LastWriteTime, out this.lastModDate, out this.lastModTime);
+            this.zip64 = zip64;
+
+            if (this.zip64)
+            {
+                this.compressedSize = UInt32.MaxValue;
+                this.uncompressedSize = UInt32.MaxValue;
+                this.diskStart = UInt16.MaxValue;
+                this.versionMadeBy = 45;
+                this.versionNeeded = 45;
+                ZipExtraFileField field = new ZipExtraFileField();
+                field.fieldType = ZipExtraFileFieldType.ZIP64;
+                field.SetZip64Data(
+                    fileInfo.CompressedLength,
+                    fileInfo.Length,
+                    0,
+                    fileInfo.ArchiveNumber);
+                this.extraFields = new ZipExtraFileField[] { field };
+            }
+            else
+            {
+                this.compressedSize = (uint) fileInfo.CompressedLength;
+                this.uncompressedSize = (uint) fileInfo.Length;
+                this.diskStart = (ushort) fileInfo.ArchiveNumber;
+            }
+        }
+
+        [SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "compressedSize")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "uncompressedSize")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "crc32")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "localHeaderOffset")]
+        public void Update(
+            long compressedSize,
+            long uncompressedSize,
+            uint crc32,
+            long localHeaderOffset,
+            int archiveNumber)
+        {
+            this.crc32 = crc32;
+
+            if (this.zip64)
+            {
+                this.compressedSize = UInt32.MaxValue;
+                this.uncompressedSize = UInt32.MaxValue;
+                this.localHeaderOffset = UInt32.MaxValue;
+                this.diskStart = UInt16.MaxValue;
+
+                if (this.extraFields != null)
+                {
+                    foreach (ZipExtraFileField field in this.extraFields)
+                    {
+                        if (field.fieldType == ZipExtraFileFieldType.ZIP64)
+                        {
+                            field.SetZip64Data(
+                                compressedSize,
+                                uncompressedSize,
+                                localHeaderOffset,
+                                archiveNumber);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                this.compressedSize = (uint) compressedSize;
+                this.uncompressedSize = (uint) uncompressedSize;
+                this.localHeaderOffset = (uint) localHeaderOffset;
+                this.diskStart = (ushort) archiveNumber;
+            }
+        }
+
+        public bool Read(Stream stream, bool central)
+        {
+            long startPos = stream.Position;
+
+            if (stream.Length - startPos <
+                (central ? CFH_FIXEDSIZE : LFH_FIXEDSIZE))
+            {
+                return false;
+            }
+
+            BinaryReader reader = new BinaryReader(stream);
+            uint sig = reader.ReadUInt32();
+
+            if (sig == SPANSIG || sig == SPANSIG2)
+            {
+                // Spanned zip files may optionally begin with a special marker.
+                // Just ignore it and move on.
+                sig = reader.ReadUInt32();
+            }
+
+            if (sig != (central ? CFHSIG : LFHSIG))
+            {
+                return false;
+            }
+
+            this.versionMadeBy = (central ? reader.ReadUInt16() : (ushort) 0);
+            this.versionNeeded = reader.ReadUInt16();
+            this.flags = (ZipFileFlags) reader.ReadUInt16();
+            this.compressionMethod = (ZipCompressionMethod) reader.ReadUInt16();
+            this.lastModTime = reader.ReadInt16();
+            this.lastModDate = reader.ReadInt16();
+            this.crc32 = reader.ReadUInt32();
+            this.compressedSize = reader.ReadUInt32();
+            this.uncompressedSize = reader.ReadUInt32();
+            
+            this.zip64 = this.uncompressedSize == UInt32.MaxValue;
+
+            int fileNameLength = reader.ReadUInt16();
+            int extraFieldLength = reader.ReadUInt16();
+            int fileCommentLength;
+
+            if (central)
+            {
+                fileCommentLength = reader.ReadUInt16();
+
+                this.diskStart = reader.ReadUInt16();
+                this.internalFileAttrs = reader.ReadUInt16();
+                this.externalFileAttrs = reader.ReadUInt32();
+                this.localHeaderOffset = reader.ReadUInt32();
+            }
+            else
+            {
+                fileCommentLength = 0;
+                this.diskStart = 0;
+                this.internalFileAttrs = 0;
+                this.externalFileAttrs = 0;
+                this.localHeaderOffset = 0;
+            }
+
+            if (stream.Length - stream.Position <
+                fileNameLength + extraFieldLength + fileCommentLength)
+            {
+                return false;
+            }
+
+            Encoding headerEncoding = ((this.flags | ZipFileFlags.UTF8) != 0 ?
+                Encoding.UTF8 : Encoding.GetEncoding(CultureInfo.CurrentCulture.TextInfo.OEMCodePage));
+
+            byte[] fileNameBytes = reader.ReadBytes(fileNameLength);
+            this.fileName = headerEncoding.GetString(fileNameBytes).Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+
+            List<ZipExtraFileField> fields = new List<ZipExtraFileField>();
+            while (extraFieldLength > 0)
+            {
+                ZipExtraFileField field = new ZipExtraFileField();
+                if (!field.Read(stream, ref extraFieldLength))
+                {
+                    return false;
+                }
+                fields.Add(field);
+                if (field.fieldType == ZipExtraFileFieldType.ZIP64)
+                {
+                    this.zip64 = true;
+                }
+            }
+            this.extraFields = fields.ToArray();
+
+            byte[] fileCommentBytes = reader.ReadBytes(fileCommentLength);
+            this.fileComment = headerEncoding.GetString(fileCommentBytes);
+
+            return true;
+        }
+
+        public void Write(Stream stream, bool central)
+        {
+            byte[] fileNameBytes = (this.fileName != null
+                ? Encoding.UTF8.GetBytes(this.fileName) : new byte[0]);
+            byte[] fileCommentBytes = (this.fileComment != null
+                ? Encoding.UTF8.GetBytes(this.fileComment) : new byte[0]);
+            bool useUtf8 =
+                (this.fileName != null && fileNameBytes.Length > this.fileName.Length) ||
+                (this.fileComment != null && fileCommentBytes.Length > this.fileComment.Length);
+            if (useUtf8)
+            {
+                this.flags |= ZipFileFlags.UTF8;
+            }
+
+            BinaryWriter writer = new BinaryWriter(stream);
+            writer.Write(central ? CFHSIG : LFHSIG);
+            if (central)
+            {
+                writer.Write(this.versionMadeBy);
+            }
+            writer.Write(this.versionNeeded);
+            writer.Write((ushort) this.flags);
+            writer.Write((ushort) this.compressionMethod);
+            writer.Write(this.lastModTime);
+            writer.Write(this.lastModDate);
+            writer.Write(this.crc32);
+            writer.Write(this.compressedSize);
+            writer.Write(this.uncompressedSize);
+            
+            ushort extraFieldLength = 0;
+            if (this.extraFields != null)
+            {
+                foreach (ZipExtraFileField field in this.extraFields)
+                {
+                    if (field.data != null)
+                    {
+                        extraFieldLength += (ushort) (4 + field.data.Length);
+                    }
+                }
+            }
+
+            writer.Write((ushort) fileNameBytes.Length);
+            writer.Write(extraFieldLength);
+
+            if (central)
+            {
+                writer.Write((ushort) fileCommentBytes.Length);
+
+                writer.Write(this.diskStart);
+                writer.Write(this.internalFileAttrs);
+                writer.Write(this.externalFileAttrs);
+                writer.Write(this.localHeaderOffset);
+            }
+
+            writer.Write(fileNameBytes);
+
+            if (this.extraFields != null)
+            {
+                foreach (ZipExtraFileField field in this.extraFields)
+                {
+                    if (field.data != null)
+                    {
+                        field.Write(stream);
+                    }
+                }
+            }
+
+            if (central)
+            {
+                writer.Write(fileCommentBytes);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "compressedSize")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "uncompressedSize")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "crc32")]
+        [SuppressMessage("Microsoft.Maintainability", "CA1500:VariableNamesShouldNotMatchFieldNames", MessageId = "localHeaderOffset")]
+        public void GetZip64Fields(
+            out long compressedSize,
+            out long uncompressedSize,
+            out long localHeaderOffset,
+            out int archiveNumber,
+            out uint crc)
+        {
+            compressedSize = this.compressedSize;
+            uncompressedSize = this.uncompressedSize;
+            localHeaderOffset = this.localHeaderOffset;
+            archiveNumber = this.diskStart;
+            crc = this.crc32;
+
+            foreach (ZipExtraFileField field in this.extraFields)
+            {
+                if (field.fieldType == ZipExtraFileFieldType.ZIP64)
+                {
+                    field.GetZip64Data(
+                        out compressedSize,
+                        out uncompressedSize,
+                        out localHeaderOffset,
+                        out archiveNumber);
+                }
+            }
+        }
+
+        public ZipFileInfo ToZipFileInfo()
+        {
+            string name = this.fileName;
+            
+            long compressedSizeL;
+            long uncompressedSizeL;
+            long localHeaderOffsetL;
+            int archiveNumberL;
+            uint crc;
+            this.GetZip64Fields(
+                out compressedSizeL,
+                out uncompressedSizeL,
+                out localHeaderOffsetL,
+                out archiveNumberL,
+                out crc);
+
+            DateTime dateTime;
+            CompressionEngine.DosDateAndTimeToDateTime(
+                this.lastModDate,
+                this.lastModTime,
+                out dateTime);
+            FileAttributes attrs = FileAttributes.Normal;
+            // TODO: look for attrs or times in extra fields
+
+            return new ZipFileInfo(name, archiveNumberL, attrs, dateTime,
+                uncompressedSizeL, compressedSizeL, this.compressionMethod);
+        }
+
+        public bool IsDirectory
+        {
+            get
+            {
+                return this.fileName != null &&
+                    (this.fileName.EndsWith("/", StringComparison.Ordinal) ||
+                    this.fileName.EndsWith("\\", StringComparison.Ordinal));
+            }
+        }
+
+        public int GetSize(bool central)
+        {
+            int size = 30;
+
+            int fileNameSize = (this.fileName != null
+                ? Encoding.UTF8.GetByteCount(this.fileName) : 0);
+            size += fileNameSize;
+
+            if (this.extraFields != null)
+            {
+                foreach (ZipExtraFileField field in this.extraFields)
+                {
+                    if (field.data != null)
+                    {
+                        size += 4 + field.data.Length;
+                    }
+                }
+            }
+
+            if (central)
+            {
+                size += 16;
+
+                int fileCommentSize = (this.fileComment != null
+                    ? Encoding.UTF8.GetByteCount(this.fileComment) : 0);
+                size += fileCommentSize;
+            }
+
+            return size;
+        }
+    }
+
+    internal class ZipExtraFileField
+    {
+        public ZipExtraFileFieldType fieldType;
+        public byte[] data;
+
+        public bool Read(Stream stream, ref int bytesRemaining)
+        {
+            if (bytesRemaining < 4)
+            {
+                return false;
+            }
+
+            BinaryReader reader = new BinaryReader(stream);
+
+            this.fieldType = (ZipExtraFileFieldType) reader.ReadUInt16();
+            ushort dataSize = reader.ReadUInt16();
+            bytesRemaining -= 4;
+
+            if (bytesRemaining < dataSize)
+            {
+                return false;
+            }
+
+            this.data = reader.ReadBytes(dataSize);
+            bytesRemaining -= dataSize;
+
+            return true;
+        }
+
+        public void Write(Stream stream)
+        {
+            BinaryWriter writer = new BinaryWriter(stream);
+            writer.Write((ushort) this.fieldType);
+
+            byte[] dataBytes = (this.data != null ? this.data : new byte[0]);
+            writer.Write((ushort) dataBytes.Length);
+            writer.Write(dataBytes);
+        }
+
+        public bool GetZip64Data(
+            out long compressedSize,
+            out long uncompressedSize,
+            out long localHeaderOffset,
+            out int diskStart)
+        {
+            uncompressedSize = 0;
+            compressedSize = 0;
+            localHeaderOffset = 0;
+            diskStart = 0;
+
+            if (this.fieldType != ZipExtraFileFieldType.ZIP64 ||
+                this.data == null || this.data.Length != 28)
+            {
+                return false;
+            }
+
+            using (MemoryStream dataStream = new MemoryStream(this.data))
+            {
+                BinaryReader reader = new BinaryReader(dataStream);
+                uncompressedSize = reader.ReadInt64();
+                compressedSize = reader.ReadInt64();
+                localHeaderOffset = reader.ReadInt64();
+                diskStart = reader.ReadInt32();
+            }
+
+            return true;
+        }
+
+        public bool SetZip64Data(
+            long compressedSize,
+            long uncompressedSize,
+            long localHeaderOffset,
+            int diskStart)
+        {
+            if (this.fieldType != ZipExtraFileFieldType.ZIP64)
+            {
+                return false;
+            }
+
+            using (MemoryStream dataStream = new MemoryStream())
+            {
+                BinaryWriter writer = new BinaryWriter(dataStream);
+                writer.Write(uncompressedSize);
+                writer.Write(compressedSize);
+                writer.Write(localHeaderOffset);
+                writer.Write(diskStart);
+                this.data = dataStream.ToArray();
+            }
+
+            return true;
+        }
+    }
+
+    internal class ZipEndOfCentralDirectory
+    {
+        public const uint EOCDSIG = 0x06054B50;
+        public const uint EOCD64SIG = 0x06064B50;
+
+        public const uint EOCD_RECORD_FIXEDSIZE = 22;
+        public const uint EOCD64_RECORD_FIXEDSIZE = 56;
+
+        public ushort versionMadeBy;
+        public ushort versionNeeded;
+        public uint diskNumber;
+        public uint dirStartDiskNumber;
+        public long entriesOnDisk;
+        public long totalEntries;
+        public long dirSize;
+        public long dirOffset;
+        public string comment;
+        public bool zip64;
+
+        public ZipEndOfCentralDirectory()
+        {
+            this.versionMadeBy = 20;
+            this.versionNeeded = 20;
+        }
+
+        public bool Read(Stream stream)
+        {
+            long startPos = stream.Position;
+
+            if (stream.Length - startPos < EOCD_RECORD_FIXEDSIZE)
+            {
+                return false;
+            }
+
+            BinaryReader reader = new BinaryReader(stream);
+            uint sig = reader.ReadUInt32();
+
+            this.zip64 = false;
+            if (sig != EOCDSIG)
+            {
+                if (sig == EOCD64SIG)
+                {
+                    this.zip64 = true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+
+            if (this.zip64)
+            {
+                if (stream.Length - startPos < EOCD64_RECORD_FIXEDSIZE)
+                {
+                    return false;
+                }
+
+                long recordSize = reader.ReadInt64();
+                this.versionMadeBy = reader.ReadUInt16();
+                this.versionNeeded = reader.ReadUInt16();
+                this.diskNumber = reader.ReadUInt32();
+                this.dirStartDiskNumber = reader.ReadUInt32();
+                this.entriesOnDisk = reader.ReadInt64();
+                this.totalEntries = reader.ReadInt64();
+                this.dirSize = reader.ReadInt64();
+                this.dirOffset = reader.ReadInt64();
+
+                // Ignore any extended zip64 eocd data.
+                long exDataSize = recordSize + 12 - EOCD64_RECORD_FIXEDSIZE;
+
+                if (stream.Length - stream.Position < exDataSize)
+                {
+                    return false;
+                }
+
+                stream.Seek(exDataSize, SeekOrigin.Current);
+
+                this.comment = null;
+            }
+            else
+            {
+                this.diskNumber = reader.ReadUInt16();
+                this.dirStartDiskNumber = reader.ReadUInt16();
+                this.entriesOnDisk = reader.ReadUInt16();
+                this.totalEntries = reader.ReadUInt16();
+                this.dirSize = reader.ReadUInt32();
+                this.dirOffset = reader.ReadUInt32();
+
+                int commentLength = reader.ReadUInt16();
+
+                if (stream.Length - stream.Position < commentLength)
+                {
+                    return false;
+                }
+
+                byte[] commentBytes = reader.ReadBytes(commentLength);
+                this.comment = Encoding.UTF8.GetString(commentBytes);
+            }
+
+            return true;
+        }
+
+        public void Write(Stream stream)
+        {
+            BinaryWriter writer = new BinaryWriter(stream);
+
+            if (this.zip64)
+            {
+                writer.Write(EOCD64SIG);
+                writer.Write((long) EOCD64_RECORD_FIXEDSIZE);
+                writer.Write(this.versionMadeBy);
+                writer.Write(this.versionNeeded);
+                writer.Write(this.diskNumber);
+                writer.Write(this.dirStartDiskNumber);
+                writer.Write(this.entriesOnDisk);
+                writer.Write(this.totalEntries);
+                writer.Write(this.dirSize);
+                writer.Write(this.dirOffset);
+            }
+            else
+            {
+                writer.Write(EOCDSIG);
+                writer.Write((ushort) Math.Min((int) UInt16.MaxValue, this.diskNumber));
+                writer.Write((ushort) Math.Min((int) UInt16.MaxValue, this.dirStartDiskNumber));
+                writer.Write((ushort) Math.Min((int) UInt16.MaxValue, this.entriesOnDisk));
+                writer.Write((ushort) Math.Min((int) UInt16.MaxValue, this.totalEntries));
+                writer.Write((uint) Math.Min((long) UInt32.MaxValue, this.dirSize));
+                writer.Write((uint) Math.Min((long) UInt32.MaxValue, this.dirOffset));
+
+                byte[] commentBytes = (this.comment != null
+                    ? Encoding.UTF8.GetBytes(this.comment) : new byte[0]);
+                writer.Write((ushort) commentBytes.Length);
+                writer.Write(commentBytes);
+            }
+        }
+
+        public int GetSize(bool zip64Size)
+        {
+            if (zip64Size)
+            {
+                return 56;
+            }
+            else
+            {
+                int commentSize = (this.comment != null
+                    ? Encoding.UTF8.GetByteCount(this.comment) : 0);
+                return 22 + commentSize;
+            }
+        }
+    }
+
+    internal class Zip64EndOfCentralDirectoryLocator
+    {
+        public const uint EOCDL64SIG = 0x07064B50;
+
+        public const uint EOCDL64_SIZE = 20;
+
+        public uint dirStartDiskNumber;
+        public long dirOffset;
+        public uint totalDisks;
+
+        public bool Read(Stream stream)
+        {
+            long startPos = stream.Position;
+            if (stream.Length - startPos < EOCDL64_SIZE)
+            {
+                return false;
+            }
+
+            BinaryReader reader = new BinaryReader(stream);
+            uint sig = reader.ReadUInt32();
+
+            if (sig != EOCDL64SIG)
+            {
+                return false;
+            }
+
+            this.dirStartDiskNumber = reader.ReadUInt32();
+            this.dirOffset = reader.ReadInt64();
+            this.totalDisks = reader.ReadUInt32();
+
+            return true;
+        }
+
+        public void Write(Stream stream)
+        {
+            BinaryWriter writer = new BinaryWriter(stream);
+            writer.Write(EOCDL64SIG);
+            writer.Write(this.dirStartDiskNumber);
+            writer.Write(this.dirOffset);
+            writer.Write(this.totalDisks);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/ZipInfo.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipInfo.cs
new file mode 100644
index 00000000..73f65fa0
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipInfo.cs
@@ -0,0 +1,82 @@
+// 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.Dtf.Compression.Zip
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Object representing a zip file on disk; provides access to
+    /// file-based operations on the zip file.
+    /// </summary>
+    /// <remarks>
+    /// Generally, the methods on this class are much easier to use than the
+    /// stream-based interfaces provided by the <see cref="ZipEngine"/> class.
+    /// </remarks>
+    [Serializable]
+    public class ZipInfo : ArchiveInfo
+    {
+        /// <summary>
+        /// Creates a new CabinetInfo object representing a zip file in a specified path.
+        /// </summary>
+        /// <param name="path">The path to the zip file. When creating a zip file, this file does not
+        /// necessarily exist yet.</param>
+        public ZipInfo(string path)
+            : base(path)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the CabinetInfo class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected ZipInfo(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Creates a compression engine that does the low-level work for
+        /// this object.
+        /// </summary>
+        /// <returns>A new <see cref="ZipEngine"/> instance.</returns>
+        /// <remarks>
+        /// Each instance will be <see cref="CompressionEngine.Dispose()"/>d
+        /// immediately after use.
+        /// </remarks>
+        protected override CompressionEngine CreateCompressionEngine()
+        {
+            return new ZipEngine();
+        }
+
+        /// <summary>
+        /// Gets information about the files contained in the archive.
+        /// </summary>
+        /// <returns>A list of <see cref="ZipFileInfo"/> objects, each
+        /// containing information about a file in the archive.</returns>
+        public new IList<ZipFileInfo> GetFiles()
+        {
+            IList<ArchiveFileInfo> files = base.GetFiles();
+            List<ZipFileInfo> zipFiles = new List<ZipFileInfo>(files.Count);
+            foreach (ZipFileInfo zipFile in files) zipFiles.Add(zipFile);
+            return zipFiles.AsReadOnly();
+        }
+
+        /// <summary>
+        /// Gets information about the certain files contained in the archive file.
+        /// </summary>
+        /// <param name="searchPattern">The search string, such as
+        /// &quot;*.txt&quot;.</param>
+        /// <returns>A list of <see cref="ZipFileInfo"/> objects, each containing
+        /// information about a file in the archive.</returns>
+        public new IList<ZipFileInfo> GetFiles(string searchPattern)
+        {
+            IList<ArchiveFileInfo> files = base.GetFiles(searchPattern);
+            List<ZipFileInfo> zipFiles = new List<ZipFileInfo>(files.Count);
+            foreach (ZipFileInfo zipFile in files) zipFiles.Add(zipFile);
+            return zipFiles.AsReadOnly();
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/ZipPacker.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipPacker.cs
new file mode 100644
index 00000000..b9c183d3
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipPacker.cs
@@ -0,0 +1,489 @@
+// 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.Dtf.Compression.Zip
+{
+    using System;
+    using System.IO;
+    using System.IO.Compression;
+    using System.Collections.Generic;
+    using System.Globalization;
+
+    public partial class ZipEngine
+    {
+        /// <summary>
+        /// Creates a zip archive or chain of zip archives.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of archive and file streams.</param>
+        /// <param name="files">An array of file lists.  Each list is
+        /// compressed into one stream in the archive.</param>
+        /// <param name="maxArchiveSize">The maximum number of bytes for one archive
+        /// before the contents are chained to the next archive, or zero for unlimited
+        /// archive size.</param>
+        /// <exception cref="ArchiveException">The archive could not be
+        /// created.</exception>
+        /// <remarks>
+        /// The stream context implementation may provide a mapping from the file
+        /// paths within the archive to the external file paths.
+        /// </remarks>
+        public override void Pack(
+            IPackStreamContext streamContext,
+            IEnumerable<string> files,
+            long maxArchiveSize)
+        {
+            if (streamContext == null)
+            {
+                throw new ArgumentNullException("streamContext");
+            }
+
+            if (files == null)
+            {
+                throw new ArgumentNullException("files");
+            }
+
+            lock (this)
+            {
+                Stream archiveStream = null;
+                try
+                {
+                    this.ResetProgressData();
+                    this.totalArchives = 1;
+
+                    object forceZip64Value = streamContext.GetOption("forceZip64", null);
+                    bool forceZip64 = Convert.ToBoolean(
+                        forceZip64Value, CultureInfo.InvariantCulture);
+
+                    // Count the total number of files and bytes to be compressed.
+                    foreach (string file in files)
+                    {
+                        FileAttributes attributes;
+                        DateTime lastWriteTime;
+                        Stream fileStream = streamContext.OpenFileReadStream(
+                            file,
+                            out attributes,
+                            out lastWriteTime);
+                        if (fileStream != null)
+                        {
+                            this.totalFileBytes += fileStream.Length;
+                            this.totalFiles++;
+                            streamContext.CloseFileReadStream(file, fileStream);
+                        }
+                    }
+
+                    List<ZipFileHeader> fileHeaders = new List<ZipFileHeader>();
+                    this.currentFileNumber = -1;
+
+                    if (this.currentArchiveName == null)
+                    {
+                        this.mainArchiveName = streamContext.GetArchiveName(0);
+                        this.currentArchiveName = this.mainArchiveName;
+
+                        if (String.IsNullOrEmpty(this.currentArchiveName))
+                        {
+                            throw new FileNotFoundException("No name provided for archive.");
+                        }
+                    }
+
+                    this.OnProgress(ArchiveProgressType.StartArchive);
+
+                    // Compress files one by one, saving header info for each.
+                    foreach (string file in files)
+                    {
+                        ZipFileHeader fileHeader = this.PackOneFile(
+                                streamContext,
+                                file,
+                                maxArchiveSize,
+                                forceZip64,
+                                ref archiveStream);
+
+                        if (fileHeader != null)
+                        {
+                            fileHeaders.Add(fileHeader);
+                        }
+
+                        this.currentArchiveTotalBytes = (archiveStream != null ?
+                            archiveStream.Position : 0);
+                        this.currentArchiveBytesProcessed = this.currentArchiveTotalBytes;
+                    }
+
+                    bool zip64 = forceZip64 || this.totalFiles > UInt16.MaxValue;
+
+                    // Write the central directory composed of all the file headers.
+                    uint centralDirStartArchiveNumber = 0;
+                    long centralDirStartPosition = 0;
+                    long centralDirSize = 0;
+                    for (int i = 0; i < fileHeaders.Count; i++)
+                    {
+                        ZipFileHeader fileHeader = fileHeaders[i];
+
+                        int headerSize = fileHeader.GetSize(true);
+                        centralDirSize += headerSize;
+
+                        this.CheckArchiveWriteStream(
+                            streamContext,
+                            maxArchiveSize,
+                            headerSize,
+                            ref archiveStream);
+
+                        if (i == 0)
+                        {
+                            centralDirStartArchiveNumber = (uint) this.currentArchiveNumber;
+                            centralDirStartPosition = archiveStream.Position;
+                        }
+
+                        fileHeader.Write(archiveStream, true);
+                        if (fileHeader.zip64)
+                        {
+                            zip64 = true;
+                        }
+                    }
+
+                    this.currentArchiveTotalBytes =
+                        (archiveStream != null ? archiveStream.Position : 0);
+                    this.currentArchiveBytesProcessed = this.currentArchiveTotalBytes;
+
+                    ZipEndOfCentralDirectory eocd = new ZipEndOfCentralDirectory();
+                    eocd.dirStartDiskNumber = centralDirStartArchiveNumber;
+                    eocd.entriesOnDisk = fileHeaders.Count;
+                    eocd.totalEntries = fileHeaders.Count;
+                    eocd.dirSize = centralDirSize;
+                    eocd.dirOffset = centralDirStartPosition;
+                    eocd.comment = this.comment;
+
+                    Zip64EndOfCentralDirectoryLocator eocdl =
+                        new Zip64EndOfCentralDirectoryLocator();
+
+                    int maxFooterSize = eocd.GetSize(false);
+                    if (archiveStream != null && (zip64 || archiveStream.Position >
+                        ((long) UInt32.MaxValue) - eocd.GetSize(false)))
+                    {
+                        maxFooterSize += eocd.GetSize(true) + (int)
+                            Zip64EndOfCentralDirectoryLocator.EOCDL64_SIZE;
+                        zip64 = true;
+                    }
+
+                    this.CheckArchiveWriteStream(
+                        streamContext,
+                        maxArchiveSize,
+                        maxFooterSize,
+                        ref archiveStream);
+                    eocd.diskNumber = (uint) this.currentArchiveNumber;
+
+                    if (zip64)
+                    {
+                        eocd.versionMadeBy = 45;
+                        eocd.versionNeeded = 45;
+                        eocd.zip64 = true;
+                        eocdl.dirOffset = archiveStream.Position;
+                        eocdl.dirStartDiskNumber = (uint) this.currentArchiveNumber;
+                        eocdl.totalDisks = (uint) this.currentArchiveNumber + 1;
+                        eocd.Write(archiveStream);
+                        eocdl.Write(archiveStream);
+
+                        eocd.dirOffset = UInt32.MaxValue;
+                        eocd.dirStartDiskNumber = UInt16.MaxValue;
+                    }
+
+                    eocd.zip64 = false;
+                    eocd.Write(archiveStream);
+
+                    this.currentArchiveTotalBytes = archiveStream.Position;
+                    this.currentArchiveBytesProcessed = this.currentArchiveTotalBytes;
+                }
+                finally
+                {
+                    if (archiveStream != null)
+                    {
+                        streamContext.CloseArchiveWriteStream(
+                            this.currentArchiveNumber, this.mainArchiveName, archiveStream);
+                        this.OnProgress(ArchiveProgressType.FinishArchive);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Moves to the next archive in the sequence if necessary.
+        /// </summary>
+        private void CheckArchiveWriteStream(
+            IPackStreamContext streamContext,
+            long maxArchiveSize,
+            long requiredSize,
+            ref Stream archiveStream)
+        {
+            if (archiveStream != null &&
+                archiveStream.Length > 0 && maxArchiveSize > 0)
+            {
+                long sizeRemaining = maxArchiveSize - archiveStream.Length;
+                if (sizeRemaining < requiredSize)
+                {
+                    string nextArchiveName = streamContext.GetArchiveName(
+                        this.currentArchiveNumber + 1);
+
+                    if (String.IsNullOrEmpty(nextArchiveName))
+                    {
+                        throw new FileNotFoundException("No name provided for archive #" +
+                            this.currentArchiveNumber + 1);
+                    }
+
+                    this.currentArchiveTotalBytes = archiveStream.Position;
+                    this.currentArchiveBytesProcessed = this.currentArchiveTotalBytes;
+
+                    streamContext.CloseArchiveWriteStream(
+                        this.currentArchiveNumber,
+                        nextArchiveName,
+                        archiveStream);
+                    archiveStream = null;
+
+                    this.OnProgress(ArchiveProgressType.FinishArchive);
+
+                    this.currentArchiveNumber++;
+                    this.totalArchives++;
+                    this.currentArchiveBytesProcessed = 0;
+                    this.currentArchiveTotalBytes = 0;
+                }
+            }
+
+            if (archiveStream == null)
+            {
+                if (this.currentArchiveNumber > 0)
+                {
+                    this.OnProgress(ArchiveProgressType.StartArchive);
+                }
+
+                archiveStream = streamContext.OpenArchiveWriteStream(
+                    this.currentArchiveNumber, this.mainArchiveName, true, this);
+
+                if (archiveStream == null)
+                {
+                    throw new FileNotFoundException("Stream not provided for archive #" +
+                        this.currentArchiveNumber);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Adds one file to a zip archive in the process of being created.
+        /// </summary>
+        private ZipFileHeader PackOneFile(
+            IPackStreamContext streamContext,
+            string file,
+            long maxArchiveSize,
+            bool forceZip64,
+            ref Stream archiveStream)
+        {
+            Stream fileStream = null;
+            int headerArchiveNumber = 0;
+            try
+            {
+                // TODO: call GetOption to get compression method for the specific file
+                ZipCompressionMethod compressionMethod = ZipCompressionMethod.Deflate;
+                if (this.CompressionLevel == WixToolset.Dtf.Compression.CompressionLevel.None)
+                {
+                    compressionMethod = ZipCompressionMethod.Store;
+                }
+
+                Converter<Stream, Stream> compressionStreamCreator;
+                if (!ZipEngine.compressionStreamCreators.TryGetValue(
+                    compressionMethod, out compressionStreamCreator))
+                {
+                    return null;
+                }
+
+                FileAttributes attributes;
+                DateTime lastWriteTime;
+                fileStream = streamContext.OpenFileReadStream(
+                    file, out attributes, out lastWriteTime);
+                if (fileStream == null)
+                {
+                    return null;
+                }
+
+                this.currentFileName = file;
+                this.currentFileNumber++;
+
+                this.currentFileTotalBytes = fileStream.Length;
+                this.currentFileBytesProcessed = 0;
+                this.OnProgress(ArchiveProgressType.StartFile);
+
+                ZipFileInfo fileInfo = new ZipFileInfo(
+                    file,
+                    this.currentArchiveNumber,
+                    attributes,
+                    lastWriteTime,
+                    fileStream.Length,
+                    0,
+                    compressionMethod);
+
+                bool zip64 = forceZip64 || fileStream.Length >= (long) UInt32.MaxValue;
+                ZipFileHeader fileHeader = new ZipFileHeader(fileInfo, zip64);
+
+                this.CheckArchiveWriteStream(
+                    streamContext,
+                    maxArchiveSize,
+                    fileHeader.GetSize(false),
+                    ref archiveStream);
+
+                long headerPosition = archiveStream.Position;
+                fileHeader.Write(archiveStream, false);
+                headerArchiveNumber = this.currentArchiveNumber;
+
+                uint crc;
+                long bytesWritten = this.PackFileBytes(
+                    streamContext,
+                    fileStream,
+                    maxArchiveSize,
+                    compressionStreamCreator,
+                    ref archiveStream,
+                    out crc);
+
+                fileHeader.Update(
+                    bytesWritten,
+                    fileStream.Length,
+                    crc,
+                    headerPosition,
+                    headerArchiveNumber);
+
+                streamContext.CloseFileReadStream(file, fileStream);
+                fileStream = null;
+
+                // Go back and rewrite the updated file header.
+                if (this.currentArchiveNumber == headerArchiveNumber)
+                {
+                    long fileEndPosition = archiveStream.Position;
+                    archiveStream.Seek(headerPosition, SeekOrigin.Begin);
+                    fileHeader.Write(archiveStream, false);
+                    archiveStream.Seek(fileEndPosition, SeekOrigin.Begin);
+                }
+                else
+                {
+                    // The file spanned archives, so temporarily reopen
+                    // the archive where it started.
+                    string headerArchiveName = streamContext.GetArchiveName(
+                        headerArchiveNumber + 1);
+                    Stream headerStream = null;
+                    try
+                    {
+                        headerStream = streamContext.OpenArchiveWriteStream(
+                            headerArchiveNumber, headerArchiveName, false, this);
+                        headerStream.Seek(headerPosition, SeekOrigin.Begin);
+                        fileHeader.Write(headerStream, false);
+                    }
+                    finally
+                    {
+                        if (headerStream != null)
+                        {
+                            streamContext.CloseArchiveWriteStream(
+                                headerArchiveNumber, headerArchiveName, headerStream);
+                        }
+                    }
+                }
+
+                this.OnProgress(ArchiveProgressType.FinishFile);
+
+                return fileHeader;
+            }
+            finally
+            {
+                if (fileStream != null)
+                {
+                    streamContext.CloseFileReadStream(
+                        this.currentFileName, fileStream);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Writes compressed bytes of one file to the archive,
+        /// keeping track of the CRC and number of bytes written.
+        /// </summary>
+        private long PackFileBytes(
+            IPackStreamContext streamContext,
+            Stream fileStream,
+            long maxArchiveSize,
+            Converter<Stream, Stream> compressionStreamCreator,
+            ref Stream archiveStream,
+            out uint crc)
+        {
+            long writeStartPosition = archiveStream.Position;
+            long bytesWritten = 0;
+            CrcStream fileCrcStream = new CrcStream(fileStream);
+
+            ConcatStream concatStream = new ConcatStream(
+                delegate(ConcatStream s)
+                {
+                    Stream sourceStream = s.Source;
+                    bytesWritten += sourceStream.Position - writeStartPosition;
+
+                    this.CheckArchiveWriteStream(
+                        streamContext,
+                        maxArchiveSize,
+                        1,
+                        ref sourceStream);
+
+                    writeStartPosition = sourceStream.Position;
+                    s.Source = sourceStream;
+                });
+
+            concatStream.Source = archiveStream;
+
+            if (maxArchiveSize > 0)
+            {
+                concatStream.SetLength(maxArchiveSize);
+            }
+
+            Stream compressionStream = compressionStreamCreator(concatStream);
+
+            try
+            {
+                byte[] buf = new byte[4096];
+                long bytesRemaining = fileStream.Length;
+                int counter = 0;
+                while (bytesRemaining > 0)
+                {
+                    int count = (int) Math.Min(
+                        bytesRemaining, (long) buf.Length);
+
+                    count = fileCrcStream.Read(buf, 0, count);
+                    if (count <= 0)
+                    {
+                        throw new ZipException(
+                            "Failed to read file: " + this.currentFileName);
+                    }
+
+                    compressionStream.Write(buf, 0, count);
+                    bytesRemaining -= count;
+
+                    this.fileBytesProcessed += count;
+                    this.currentFileBytesProcessed += count;
+                    this.currentArchiveTotalBytes = concatStream.Source.Position;
+                    this.currentArchiveBytesProcessed = this.currentArchiveTotalBytes;
+
+                    if (++counter % 16 == 0) // Report every 64K
+                    {
+                        this.OnProgress(ArchiveProgressType.PartialFile);
+                    }
+                }
+
+                if (compressionStream is DeflateStream)
+                {
+                    compressionStream.Close();
+                }
+                else
+                {
+                    compressionStream.Flush();
+                }
+            }
+            finally
+            {
+                archiveStream = concatStream.Source;
+            }
+
+            bytesWritten += archiveStream.Position - writeStartPosition;
+
+            crc = fileCrcStream.Crc;
+
+            return bytesWritten;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression.Zip/ZipUnpacker.cs b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipUnpacker.cs
new file mode 100644
index 00000000..681c0e46
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression.Zip/ZipUnpacker.cs
@@ -0,0 +1,336 @@
+// 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.Dtf.Compression.Zip
+{
+    using System;
+    using System.IO;
+    using System.IO.Compression;
+    using System.Collections.Generic;
+
+    public partial class ZipEngine
+    {
+        /// <summary>
+        /// Extracts files from a zip archive or archive chain.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of archive and file streams.</param>
+        /// <param name="fileFilter">An optional predicate that can determine
+        /// which files to process.</param>
+        /// <exception cref="ArchiveException">The archive provided
+        /// by the stream context is not valid.</exception>
+        /// <remarks>
+        /// The <paramref name="fileFilter"/> predicate takes an internal file
+        /// path and returns true to include the file or false to exclude it.
+        /// </remarks>
+        public override void Unpack(
+            IUnpackStreamContext streamContext,
+            Predicate<string> fileFilter)
+        {
+            if (streamContext == null)
+            {
+                throw new ArgumentNullException("streamContext");
+            }
+
+            lock (this)
+            {
+                IList<ZipFileHeader> allHeaders = this.GetCentralDirectory(streamContext);
+                if (allHeaders == null)
+                {
+                    throw new ZipException("Zip central directory not found.");
+                }
+
+                IList<ZipFileHeader> headers = new List<ZipFileHeader>(allHeaders.Count);
+                foreach (ZipFileHeader header in allHeaders)
+                {
+                    if (!header.IsDirectory &&
+                        (fileFilter == null || fileFilter(header.fileName)))
+                    {
+                        headers.Add(header);
+                    }
+                }
+
+                this.ResetProgressData();
+
+                // Count the total number of files and bytes to be compressed.
+                this.totalFiles = headers.Count;
+                foreach (ZipFileHeader header in headers)
+                {
+                    long compressedSize;
+                    long uncompressedSize;
+                    long localHeaderOffset;
+                    int archiveNumber;
+                    uint crc;
+                    header.GetZip64Fields(
+                        out compressedSize,
+                        out uncompressedSize,
+                        out localHeaderOffset,
+                        out archiveNumber,
+                        out crc);
+
+                    this.totalFileBytes += uncompressedSize;
+                    if (archiveNumber >= this.totalArchives)
+                    {
+                        this.totalArchives = (short) (archiveNumber + 1);
+                    }
+                }
+
+                this.currentArchiveNumber = -1;
+                this.currentFileNumber = -1;
+                Stream archiveStream = null;
+                try
+                {
+                    foreach (ZipFileHeader header in headers)
+                    {
+                        this.currentFileNumber++;
+                        this.UnpackOneFile(streamContext, header, ref archiveStream);
+                    }
+                }
+                finally
+                {
+                    if (archiveStream != null)
+                    {
+                        streamContext.CloseArchiveReadStream(
+                            0, String.Empty, archiveStream);
+                        this.currentArchiveNumber--;
+                        this.OnProgress(ArchiveProgressType.FinishArchive);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Unpacks a single file from an archive or archive chain.
+        /// </summary>
+        private void UnpackOneFile(
+            IUnpackStreamContext streamContext,
+            ZipFileHeader header,
+            ref Stream archiveStream)
+        {
+            ZipFileInfo fileInfo = null;
+            Stream fileStream = null;
+            try
+            {
+                Converter<Stream, Stream> compressionStreamCreator;
+                if (!ZipEngine.decompressionStreamCreators.TryGetValue(
+                    header.compressionMethod, out compressionStreamCreator))
+                {
+                    // Silently skip files of an unsupported compression method.
+                    return;
+                }
+
+                long compressedSize;
+                long uncompressedSize;
+                long localHeaderOffset;
+                int archiveNumber;
+                uint crc;
+                header.GetZip64Fields(
+                    out compressedSize,
+                    out uncompressedSize,
+                    out localHeaderOffset,
+                    out archiveNumber,
+                    out crc);
+
+                if (this.currentArchiveNumber != archiveNumber + 1)
+                {
+                    if (archiveStream != null)
+                    {
+                        streamContext.CloseArchiveReadStream(
+                            this.currentArchiveNumber,
+                            String.Empty,
+                            archiveStream);
+                        archiveStream = null;
+
+                        this.OnProgress(ArchiveProgressType.FinishArchive);
+                        this.currentArchiveName = null;
+                    }
+
+                    this.currentArchiveNumber = (short) (archiveNumber + 1);
+                    this.currentArchiveBytesProcessed = 0;
+                    this.currentArchiveTotalBytes = 0;
+
+                    archiveStream = this.OpenArchive(
+                        streamContext, this.currentArchiveNumber);
+
+                    FileStream archiveFileStream = archiveStream as FileStream;
+                    this.currentArchiveName = (archiveFileStream != null ?
+                        Path.GetFileName(archiveFileStream.Name) : null);
+
+                    this.currentArchiveTotalBytes = archiveStream.Length;
+                    this.currentArchiveNumber--;
+                    this.OnProgress(ArchiveProgressType.StartArchive);
+                    this.currentArchiveNumber++;
+                }
+
+                archiveStream.Seek(localHeaderOffset, SeekOrigin.Begin);
+
+                ZipFileHeader localHeader = new ZipFileHeader();
+                if (!localHeader.Read(archiveStream, false) ||
+                    !ZipEngine.AreFilePathsEqual(localHeader.fileName, header.fileName))
+                {
+                    string msg = "Could not read file: " + header.fileName;
+                    throw new ZipException(msg);
+                }
+
+                fileInfo = header.ToZipFileInfo();
+
+                fileStream = streamContext.OpenFileWriteStream(
+                    fileInfo.FullName,
+                    fileInfo.Length,
+                    fileInfo.LastWriteTime);
+
+                if (fileStream != null)
+                {
+                    this.currentFileName = header.fileName;
+                    this.currentFileBytesProcessed = 0;
+                    this.currentFileTotalBytes = fileInfo.Length;
+                    this.currentArchiveNumber--;
+                    this.OnProgress(ArchiveProgressType.StartFile);
+                    this.currentArchiveNumber++;
+
+                    this.UnpackFileBytes(
+                        streamContext,
+                        fileInfo.FullName,
+                        fileInfo.CompressedLength,
+                        fileInfo.Length,
+                        header.crc32,
+                        fileStream,
+                        compressionStreamCreator,
+                        ref archiveStream);
+                }
+            }
+            finally
+            {
+                if (fileStream != null)
+                {
+                    streamContext.CloseFileWriteStream(
+                        fileInfo.FullName,
+                        fileStream,
+                        fileInfo.Attributes,
+                        fileInfo.LastWriteTime);
+
+                    this.currentArchiveNumber--;
+                    this.OnProgress(ArchiveProgressType.FinishFile);
+                    this.currentArchiveNumber++;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Compares two internal file paths while ignoring case and slash differences.
+        /// </summary>
+        /// <param name="path1">The first path to compare.</param>
+        /// <param name="path2">The second path to compare.</param>
+        /// <returns>True if the paths are equivalent.</returns>
+        private static bool AreFilePathsEqual(string path1, string path2)
+        {
+            path1 = path1.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+            path2 = path2.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
+            return String.Compare(path1, path2, StringComparison.OrdinalIgnoreCase) == 0;
+        }
+
+        private Stream OpenArchive(IUnpackStreamContext streamContext, int archiveNumber)
+        {
+            Stream archiveStream = streamContext.OpenArchiveReadStream(
+                archiveNumber, String.Empty, this);
+            if (archiveStream == null && archiveNumber != 0)
+            {
+                archiveStream = streamContext.OpenArchiveReadStream(
+                    0, String.Empty, this);
+            }
+
+            if (archiveStream == null)
+            {
+                throw new FileNotFoundException("Archive stream not provided.");
+            }
+
+            return archiveStream;
+        }
+
+        /// <summary>
+        /// Decompresses bytes for one file from an archive or archive chain,
+        /// checking the crc at the end.
+        /// </summary>
+        private void UnpackFileBytes(
+            IUnpackStreamContext streamContext,
+            string fileName,
+            long compressedSize,
+            long uncompressedSize,
+            uint crc,
+            Stream fileStream,
+            Converter<Stream, Stream> compressionStreamCreator,
+            ref Stream archiveStream)
+        {
+            CrcStream crcStream = new CrcStream(fileStream);
+
+            ConcatStream concatStream = new ConcatStream(
+                delegate(ConcatStream s)
+                {
+                    this.currentArchiveBytesProcessed = s.Source.Position;
+                    streamContext.CloseArchiveReadStream(
+                        this.currentArchiveNumber,
+                        String.Empty,
+                        s.Source);
+
+                    this.currentArchiveNumber--;
+                    this.OnProgress(ArchiveProgressType.FinishArchive);
+                    this.currentArchiveNumber += 2;
+                    this.currentArchiveName = null;
+                    this.currentArchiveBytesProcessed = 0;
+                    this.currentArchiveTotalBytes = 0;
+
+                    s.Source = this.OpenArchive(streamContext, this.currentArchiveNumber);
+
+                    FileStream archiveFileStream = s.Source as FileStream;
+                    this.currentArchiveName = (archiveFileStream != null ?
+                        Path.GetFileName(archiveFileStream.Name) : null);
+
+                    this.currentArchiveTotalBytes = s.Source.Length;
+                    this.currentArchiveNumber--;
+                    this.OnProgress(ArchiveProgressType.StartArchive);
+                    this.currentArchiveNumber++;
+                });
+
+            concatStream.Source = archiveStream;
+            concatStream.SetLength(compressedSize);
+
+            Stream decompressionStream = compressionStreamCreator(concatStream);
+
+            try
+            {
+                byte[] buf = new byte[4096];
+                long bytesRemaining = uncompressedSize;
+                int counter = 0;
+                while (bytesRemaining > 0)
+                {
+                    int count = (int) Math.Min(buf.Length, bytesRemaining);
+                    count = decompressionStream.Read(buf, 0, count);
+                    crcStream.Write(buf, 0, count);
+                    bytesRemaining -= count;
+
+                    this.fileBytesProcessed += count;
+                    this.currentFileBytesProcessed += count;
+                    this.currentArchiveBytesProcessed = concatStream.Source.Position;
+
+                    if (++counter % 16 == 0) // Report every 64K
+                    {
+                        this.currentArchiveNumber--;
+                        this.OnProgress(ArchiveProgressType.PartialFile);
+                        this.currentArchiveNumber++;
+                    }
+                }
+            }
+            finally
+            {
+                archiveStream = concatStream.Source;
+            }
+
+            crcStream.Flush();
+
+            if (crcStream.Crc != crc)
+            {
+                throw new ZipException("CRC check failed for file: " + fileName);
+            }
+        }
+    }
+}
+
diff --git a/src/dtf/WixToolset.Dtf.Compression/ArchiveException.cs b/src/dtf/WixToolset.Dtf.Compression/ArchiveException.cs
new file mode 100644
index 00000000..a53e862c
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/ArchiveException.cs
@@ -0,0 +1,57 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.IO;
+    using System.Runtime.Serialization;
+
+    /// <summary>
+    /// Base exception class for compression operations. Compression libraries should
+    /// derive subclass exceptions with more specific error information relevent to the
+    /// file format.
+    /// </summary>
+    [Serializable]
+    public class ArchiveException : IOException
+    {
+        /// <summary>
+        /// Creates a new ArchiveException with a specified error message and a reference to the
+        /// inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception. If the
+        /// innerException parameter is not a null reference (Nothing in Visual Basic), the current exception
+        /// is raised in a catch block that handles the inner exception.</param>
+        public ArchiveException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new ArchiveException with a specified error message.
+        /// </summary>
+        /// <param name="message">The message that describes the error.</param>
+        public ArchiveException(string message)
+            : this(message, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new ArchiveException.
+        /// </summary>
+        public ArchiveException()
+            : this(null, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ArchiveException class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected ArchiveException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/ArchiveFileInfo.cs b/src/dtf/WixToolset.Dtf.Compression/ArchiveFileInfo.cs
new file mode 100644
index 00000000..adcae3ec
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/ArchiveFileInfo.cs
@@ -0,0 +1,430 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.IO;
+    using System.Runtime.Serialization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Abstract object representing a compressed file within an archive;
+    /// provides operations for getting the file properties and unpacking
+    /// the file.
+    /// </summary>
+    [Serializable]
+    public abstract class ArchiveFileInfo : FileSystemInfo
+    {
+        private ArchiveInfo archiveInfo;
+        private string name;
+        private string path;
+
+        private bool initialized;
+        private bool exists;
+        private int archiveNumber;
+        private FileAttributes attributes;
+        private DateTime lastWriteTime;
+        private long length;
+
+        /// <summary>
+        /// Creates a new ArchiveFileInfo object representing a file within
+        /// an archive in a specified path.
+        /// </summary>
+        /// <param name="archiveInfo">An object representing the archive
+        /// containing the file.</param>
+        /// <param name="filePath">The path to the file within the archive.
+        /// Usually, this is a simple file name, but if the archive contains
+        /// a directory structure this may include the directory.</param>
+        protected ArchiveFileInfo(ArchiveInfo archiveInfo, string filePath)
+            : base()
+        {
+            if (filePath == null)
+            {
+                throw new ArgumentNullException("filePath");
+            }
+
+            this.Archive = archiveInfo;
+
+            this.name = System.IO.Path.GetFileName(filePath);
+            this.path = System.IO.Path.GetDirectoryName(filePath);
+
+            this.attributes = FileAttributes.Normal;
+            this.lastWriteTime = DateTime.MinValue;
+        }
+
+        /// <summary>
+        /// Creates a new ArchiveFileInfo object with all parameters specified;
+        /// used by subclasses when reading the metadata out of an archive.
+        /// </summary>
+        /// <param name="filePath">The internal path and name of the file in
+        /// the archive.</param>
+        /// <param name="archiveNumber">The archive number where the file
+        /// starts.</param>
+        /// <param name="attributes">The stored attributes of the file.</param>
+        /// <param name="lastWriteTime">The stored last write time of the
+        /// file.</param>
+        /// <param name="length">The uncompressed size of the file.</param>
+        protected ArchiveFileInfo(
+            string filePath,
+            int archiveNumber,
+            FileAttributes attributes,
+            DateTime lastWriteTime,
+            long length)
+            : this(null, filePath)
+        {
+            this.exists = true;
+            this.archiveNumber = archiveNumber;
+            this.attributes = attributes;
+            this.lastWriteTime = lastWriteTime;
+            this.length = length;
+            this.initialized = true;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ArchiveFileInfo class with
+        /// serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized
+        /// object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual
+        /// information about the source or destination.</param>
+        protected ArchiveFileInfo(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+            this.archiveInfo = (ArchiveInfo) info.GetValue(
+                "archiveInfo", typeof(ArchiveInfo));
+            this.name = info.GetString("name");
+            this.path = info.GetString("path");
+            this.initialized = info.GetBoolean("initialized");
+            this.exists = info.GetBoolean("exists");
+            this.archiveNumber = info.GetInt32("archiveNumber");
+            this.attributes = (FileAttributes) info.GetValue(
+                "attributes", typeof(FileAttributes));
+            this.lastWriteTime = info.GetDateTime("lastWriteTime");
+            this.length = info.GetInt64("length");
+        }
+
+        /// <summary>
+        /// Gets the name of the file.
+        /// </summary>
+        /// <value>The name of the file, not including any path.</value>
+        public override string Name
+        {
+            get
+            {
+                return this.name;
+            }
+        }
+
+        /// <summary>
+        /// Gets the internal path of the file in the archive.
+        /// </summary>
+        /// <value>The internal path of the file in the archive, not including
+        /// the file name.</value>
+        public string Path
+        {
+            get
+            {
+                return this.path;
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path to the file.
+        /// </summary>
+        /// <value>The full path to the file, including the full path to the
+        /// archive, the internal path in the archive, and the file name.</value>
+        /// <remarks>
+        /// For example, the path <c>"C:\archive.cab\file.txt"</c> refers to
+        /// a file "file.txt" inside the archive "archive.cab".
+        /// </remarks>
+        public override string FullName
+        {
+            get
+            {
+                string fullName = System.IO.Path.Combine(this.Path, this.Name);
+                
+                if (this.Archive != null)
+                {
+                    fullName = System.IO.Path.Combine(this.ArchiveName, fullName);
+                }
+
+                return fullName;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the archive that contains this file.
+        /// </summary>
+        /// <value>
+        /// The ArchiveInfo instance that retrieved this file information -- this
+        /// may be null if the ArchiveFileInfo object was returned directly from
+        /// a stream.
+        /// </value>
+        public ArchiveInfo Archive
+        {
+            get
+            {
+                return (ArchiveInfo) this.archiveInfo;
+            }
+
+            internal set
+            {
+                this.archiveInfo = value;
+
+                // protected instance members inherited from FileSystemInfo:
+                this.OriginalPath = (value != null ? value.FullName : null);
+                this.FullPath = this.OriginalPath;
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path of the archive that contains this file.
+        /// </summary>
+        /// <value>The full path of the archive that contains this file.</value>
+        public string ArchiveName
+        {
+            get
+            {
+                return this.Archive != null ? this.Archive.FullName : null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of the archive where this file starts.
+        /// </summary>
+        /// <value>The number of the archive where this file starts.</value>
+        /// <remarks>A single archive or the first archive in a chain is
+        /// numbered 0.</remarks>
+        public int ArchiveNumber
+        {
+            get
+            {
+                return this.archiveNumber;
+            }
+        }
+
+        /// <summary>
+        /// Checks if the file exists within the archive.
+        /// </summary>
+        /// <value>True if the file exists, false otherwise.</value>
+        public override bool Exists
+        {
+            get
+            {
+                if (!this.initialized)
+                {
+                    this.Refresh();
+                }
+
+                return this.exists;
+            }
+        }
+
+        /// <summary>
+        /// Gets the uncompressed size of the file.
+        /// </summary>
+        /// <value>The uncompressed size of the file in bytes.</value>
+        public long Length
+        {
+            get
+            {
+                if (!this.initialized)
+                {
+                    this.Refresh();
+                }
+
+                return this.length;
+            }
+        }
+
+        /// <summary>
+        /// Gets the attributes of the file.
+        /// </summary>
+        /// <value>The attributes of the file as stored in the archive.</value>
+        public new FileAttributes Attributes
+        {
+            get
+            {
+                if (!this.initialized)
+                {
+                    this.Refresh();
+                }
+
+                return this.attributes;
+            }
+        }
+
+        /// <summary>
+        /// Gets the last modification time of the file.
+        /// </summary>
+        /// <value>The last modification time of the file as stored in the
+        /// archive.</value>
+        public new DateTime LastWriteTime
+        {
+            get
+            {
+                if (!this.initialized)
+                {
+                    this.Refresh();
+                }
+
+                return this.lastWriteTime;
+            }
+        }
+
+        /// <summary>
+        /// Sets the SerializationInfo with information about the archive.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized
+        /// object data.</param>
+        /// <param name="context">The StreamingContext that contains contextual
+        /// information about the source or destination.</param>
+        public override void GetObjectData(
+            SerializationInfo info, StreamingContext context)
+        {
+            base.GetObjectData(info, context);
+            info.AddValue("archiveInfo", this.archiveInfo);
+            info.AddValue("name", this.name);
+            info.AddValue("path", this.path);
+            info.AddValue("initialized", this.initialized);
+            info.AddValue("exists", this.exists);
+            info.AddValue("archiveNumber", this.archiveNumber);
+            info.AddValue("attributes", this.attributes);
+            info.AddValue("lastWriteTime", this.lastWriteTime);
+            info.AddValue("length", this.length);
+        }
+
+        /// <summary>
+        /// Gets the full path to the file.
+        /// </summary>
+        /// <returns>The same as <see cref="FullName"/></returns>
+        public override string ToString()
+        {
+            return this.FullName;
+        }
+
+        /// <summary>
+        /// Deletes the file. NOT SUPPORTED.
+        /// </summary>
+        /// <exception cref="NotSupportedException">Files cannot be deleted
+        /// from an existing archive.</exception>
+        public override void Delete()
+        {
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Refreshes the attributes and other cached information about the file,
+        /// by re-reading the information from the archive.
+        /// </summary>
+        public new void Refresh()
+        {
+            base.Refresh();
+
+            if (this.Archive != null)
+            {
+                string filePath = System.IO.Path.Combine(this.Path, this.Name);
+                ArchiveFileInfo updatedFile = this.Archive.GetFile(filePath);
+                if (updatedFile == null)
+                {
+                    throw new FileNotFoundException(
+                            "File not found in archive.", filePath);
+                }
+
+                this.Refresh(updatedFile);
+            }
+        }
+
+        /// <summary>
+        /// Extracts the file.
+        /// </summary>
+        /// <param name="destFileName">The destination path where the file
+        /// will be extracted.</param>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void CopyTo(string destFileName)
+        {
+            this.CopyTo(destFileName, false);
+        }
+
+        /// <summary>
+        /// Extracts the file, optionally overwriting any existing file.
+        /// </summary>
+        /// <param name="destFileName">The destination path where the file
+        /// will be extracted.</param>
+        /// <param name="overwrite">If true, <paramref name="destFileName"/>
+        /// will be overwritten if it exists.</param>
+        /// <exception cref="IOException"><paramref name="overwrite"/> is false
+        /// and <paramref name="destFileName"/> exists.</exception>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void CopyTo(string destFileName, bool overwrite)
+        {
+            if (destFileName == null)
+            {
+                throw new ArgumentNullException("destFileName");
+            }
+
+            if (!overwrite && File.Exists(destFileName))
+            {
+                throw new IOException();
+            }
+
+            if (this.Archive == null)
+            {
+                throw new InvalidOperationException();
+            }
+
+            this.Archive.UnpackFile(
+                System.IO.Path.Combine(this.Path, this.Name), destFileName);
+        }
+
+        /// <summary>
+        /// Opens the archive file for reading without actually extracting the
+        /// file to disk.
+        /// </summary>
+        /// <returns>
+        /// A stream for reading directly from the packed file. Like any stream
+        /// this should be closed/disposed as soon as it is no longer needed.
+        /// </returns>
+        public Stream OpenRead()
+        {
+            return this.Archive.OpenRead(System.IO.Path.Combine(this.Path, this.Name));
+        }
+
+        /// <summary>
+        /// Opens the archive file reading text with UTF-8 encoding without
+        /// actually extracting the file to disk.
+        /// </summary>
+        /// <returns>
+        /// A reader for reading text directly from the packed file. Like any reader
+        /// this should be closed/disposed as soon as it is no longer needed.
+        /// </returns>
+        /// <remarks>
+        /// To open an archived text file with different encoding, use the
+        /// <see cref="OpenRead" /> method and pass the returned stream to one of
+        /// the <see cref="StreamReader" /> constructor overloads.
+        /// </remarks>
+        public StreamReader OpenText()
+        {
+            return this.Archive.OpenText(System.IO.Path.Combine(this.Path, this.Name));
+        }
+
+        /// <summary>
+        /// Refreshes the information in this object with new data retrieved
+        /// from an archive.
+        /// </summary>
+        /// <param name="newFileInfo">Fresh instance for the same file just
+        /// read from the archive.</param>
+        /// <remarks>
+        /// Subclasses may override this method to refresh sublcass fields.
+        /// However they should always call the base implementation first.
+        /// </remarks>
+        protected virtual void Refresh(ArchiveFileInfo newFileInfo)
+        {
+            this.exists = newFileInfo.exists;
+            this.length = newFileInfo.length;
+            this.attributes = newFileInfo.attributes;
+            this.lastWriteTime = newFileInfo.lastWriteTime;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/ArchiveFileStreamContext.cs b/src/dtf/WixToolset.Dtf.Compression/ArchiveFileStreamContext.cs
new file mode 100644
index 00000000..8be3bff4
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/ArchiveFileStreamContext.cs
@@ -0,0 +1,664 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.IO;
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Provides a basic implementation of the archive pack and unpack stream context
+    /// interfaces, based on a list of archive files, a default directory, and an
+    /// optional mapping from internal to external file paths.
+    /// </summary>
+    /// <remarks>
+    /// This class can also handle creating or extracting chained archive packages.
+    /// </remarks>
+    public class ArchiveFileStreamContext
+        : IPackStreamContext, IUnpackStreamContext
+    {
+        private IList<string> archiveFiles;
+        private string directory;
+        private IDictionary<string, string> files;
+        private bool extractOnlyNewerFiles;
+        private bool enableOffsetOpen;
+
+        #region Constructors
+
+        /// <summary>
+        /// Creates a new ArchiveFileStreamContext with a archive file and
+        /// no default directory or file mapping.
+        /// </summary>
+        /// <param name="archiveFile">The path to a archive file that will be
+        /// created or extracted.</param>
+        public ArchiveFileStreamContext(string archiveFile)
+            : this(archiveFile, null, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new ArchiveFileStreamContext with a archive file, default
+        /// directory and mapping from internal to external file paths.
+        /// </summary>
+        /// <param name="archiveFile">The path to a archive file that will be
+        /// created or extracted.</param>
+        /// <param name="directory">The default root directory where files will be
+        /// located, optional.</param>
+        /// <param name="files">A mapping from internal file paths to external file
+        /// paths, optional.</param>
+        /// <remarks>
+        /// If the mapping is not null and a file is not included in the mapping,
+        /// the file will be skipped.
+        /// <para>If the external path in the mapping is a simple file name or
+        /// relative file path, it will be concatenated onto the default directory,
+        /// if one was specified.</para>
+        /// <para>For more about how the default directory and files mapping are
+        /// used, see <see cref="OpenFileReadStream"/> and
+        /// <see cref="OpenFileWriteStream"/>.</para>
+        /// </remarks>
+        public ArchiveFileStreamContext(
+            string archiveFile,
+            string directory,
+            IDictionary<string, string> files)
+            : this(new string[] { archiveFile }, directory, files)
+        {
+            if (archiveFile == null)
+            {
+                throw new ArgumentNullException("archiveFile");
+            }
+        }
+
+        /// <summary>
+        /// Creates a new ArchiveFileStreamContext with a list of archive files,
+        /// a default directory and a mapping from internal to external file paths.
+        /// </summary>
+        /// <param name="archiveFiles">A list of paths to archive files that will be
+        /// created or extracted.</param>
+        /// <param name="directory">The default root directory where files will be
+        /// located, optional.</param>
+        /// <param name="files">A mapping from internal file paths to external file
+        /// paths, optional.</param>
+        /// <remarks>
+        /// When creating chained archives, the <paramref name="archiveFiles"/> list
+        /// should include at least enough archives to handle the entire set of
+        /// input files, based on the maximum archive size that is passed to the
+        /// <see cref="CompressionEngine"/>.<see
+        /// cref="CompressionEngine.Pack(IPackStreamContext,IEnumerable&lt;string&gt;,long)"/>.
+        /// <para>If the mapping is not null and a file is not included in the mapping,
+        /// the file will be skipped.</para>
+        /// <para>If the external path in the mapping is a simple file name or
+        /// relative file path, it will be concatenated onto the default directory,
+        /// if one was specified.</para>
+        /// <para>For more about how the default directory and files mapping are used,
+        /// see <see cref="OpenFileReadStream"/> and
+        /// <see cref="OpenFileWriteStream"/>.</para>
+        /// </remarks>
+        public ArchiveFileStreamContext(
+            IList<string> archiveFiles,
+            string directory,
+            IDictionary<string, string> files)
+        {
+            if (archiveFiles == null || archiveFiles.Count == 0)
+            {
+                throw new ArgumentNullException("archiveFiles");
+            }
+
+            this.archiveFiles = archiveFiles;
+            this.directory = directory;
+            this.files = files;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Gets or sets the list of archive files that are created or extracted.
+        /// </summary>
+        /// <value>The list of archive files that are created or extracted.</value>
+        public IList<string> ArchiveFiles
+        {
+            get
+            {
+                return this.archiveFiles;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the default root directory where files are located.
+        /// </summary>
+        /// <value>The default root directory where files are located.</value>
+        /// <remarks>
+        /// For details about how the default directory is used,
+        /// see <see cref="OpenFileReadStream"/> and <see cref="OpenFileWriteStream"/>.
+        /// </remarks>
+        public string Directory
+        {
+            get
+            {
+                return this.directory;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the mapping from internal file paths to external file paths.
+        /// </summary>
+        /// <value>A mapping from internal file paths to external file paths.</value>
+        /// <remarks>
+        /// For details about how the files mapping is used,
+        /// see <see cref="OpenFileReadStream"/> and <see cref="OpenFileWriteStream"/>.
+        /// </remarks>
+        public IDictionary<string, string> Files
+        {
+            get
+            {
+                return this.files;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a flag that can prevent extracted files from overwriting
+        /// newer files that already exist.
+        /// </summary>
+        /// <value>True to prevent overwriting newer files that already exist
+        /// during extraction; false to always extract from the archive regardless
+        /// of existing files.</value>
+        public bool ExtractOnlyNewerFiles
+        {
+            get
+            {
+                return this.extractOnlyNewerFiles;
+            }
+
+            set
+            {
+                this.extractOnlyNewerFiles = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a flag that enables creating or extracting an archive
+        /// at an offset within an existing file. (This is typically used to open
+        /// archive-based self-extracting packages.)
+        /// </summary>
+        /// <value>True to search an existing package file for an archive offset
+        /// or the end of the file;/ false to always create or open a plain
+        /// archive file.</value>
+        public bool EnableOffsetOpen
+        {
+            get
+            {
+                return this.enableOffsetOpen;
+            }
+
+            set
+            {
+                this.enableOffsetOpen = value;
+            }
+        }
+
+        #endregion
+
+        #region IPackStreamContext Members
+
+        /// <summary>
+        /// Gets the name of the archive with a specified number.
+        /// </summary>
+        /// <param name="archiveNumber">The 0-based index of the archive within
+        /// the chain.</param>
+        /// <returns>The name of the requested archive. May be an empty string
+        /// for non-chained archives, but may never be null.</returns>
+        /// <remarks>This method returns the file name of the archive from the
+        /// <see cref="archiveFiles"/> list with the specified index, or an empty
+        /// string if the archive number is outside the bounds of the list. The
+        /// file name should not include any directory path.</remarks>
+        public virtual string GetArchiveName(int archiveNumber)
+        {
+            if (archiveNumber < this.archiveFiles.Count)
+            {
+                return Path.GetFileName(this.archiveFiles[archiveNumber]);
+            }
+
+            return String.Empty;
+        }
+
+        /// <summary>
+        /// Opens a stream for writing an archive.
+        /// </summary>
+        /// <param name="archiveNumber">The 0-based index of the archive within
+        /// the chain.</param>
+        /// <param name="archiveName">The name of the archive that was returned
+        /// by <see cref="GetArchiveName"/>.</param>
+        /// <param name="truncate">True if the stream should be truncated when
+        /// opened (if it already exists); false if an existing stream is being
+        /// re-opened for writing additional data.</param>
+        /// <param name="compressionEngine">Instance of the compression engine
+        /// doing the operations.</param>
+        /// <returns>A writable Stream where the compressed archive bytes will be
+        /// written, or null to cancel the archive creation.</returns>
+        /// <remarks>
+        /// This method opens the file from the <see cref="ArchiveFiles"/> list
+        /// with the specified index. If the archive number is outside the bounds
+        /// of the list, this method returns null.
+        /// <para>If the <see cref="EnableOffsetOpen"/> flag is set, this method
+        /// will seek to the start of any existing archive in the file, or to the
+        /// end of the file if the existing file is not an archive.</para>
+        /// </remarks>
+        public virtual Stream OpenArchiveWriteStream(
+            int archiveNumber,
+            string archiveName,
+            bool truncate,
+            CompressionEngine compressionEngine)
+        {
+            if (archiveNumber >= this.archiveFiles.Count)
+            {
+                return null;
+            }
+
+            if (String.IsNullOrEmpty(archiveName))
+            {
+                throw new ArgumentNullException("archiveName");
+            }
+
+            // All archives must be in the same directory,
+            // so always use the directory from the first archive.
+            string archiveFile = Path.Combine(
+                Path.GetDirectoryName(this.archiveFiles[0]), archiveName);
+            Stream stream = File.Open(
+                archiveFile,
+                (truncate ? FileMode.OpenOrCreate : FileMode.Open),
+                FileAccess.ReadWrite);
+
+            if (this.enableOffsetOpen)
+            {
+                long offset = compressionEngine.FindArchiveOffset(
+                    new DuplicateStream(stream));
+
+                // If this is not an archive file, append the archive to it.
+                if (offset < 0)
+                {
+                    offset = stream.Length;
+                }
+
+                if (offset > 0)
+                {
+                    stream = new OffsetStream(stream, offset);
+                }
+
+                stream.Seek(0, SeekOrigin.Begin);
+            }
+
+            if (truncate)
+            {
+                // Truncate the stream, in case a larger old archive starts here.
+                stream.SetLength(0);
+            }
+            
+            return stream;
+        }
+
+        /// <summary>
+        /// Closes a stream where an archive package was written.
+        /// </summary>
+        /// <param name="archiveNumber">The 0-based index of the archive within
+        /// the chain.</param>
+        /// <param name="archiveName">The name of the archive that was previously
+        /// returned by <see cref="GetArchiveName"/>.</param>
+        /// <param name="stream">A stream that was previously returned by
+        /// <see cref="OpenArchiveWriteStream"/> and is now ready to be closed.</param>
+        public virtual void CloseArchiveWriteStream(
+            int archiveNumber,
+            string archiveName,
+            Stream stream)
+        {
+            if (stream != null)
+            {
+                stream.Close();
+
+                FileStream fileStream = stream as FileStream;
+                if (fileStream != null)
+                {
+                    string streamFile = fileStream.Name;
+                    if (!String.IsNullOrEmpty(archiveName) &&
+                        archiveName != Path.GetFileName(streamFile))
+                    {
+                        string archiveFile = Path.Combine(
+                            Path.GetDirectoryName(this.archiveFiles[0]), archiveName);
+                        if (File.Exists(archiveFile))
+                        {
+                            File.Delete(archiveFile);
+                        }
+                        File.Move(streamFile, archiveFile);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Opens a stream to read a file that is to be included in an archive.
+        /// </summary>
+        /// <param name="path">The path of the file within the archive.</param>
+        /// <param name="attributes">The returned attributes of the opened file,
+        /// to be stored in the archive.</param>
+        /// <param name="lastWriteTime">The returned last-modified time of the
+        /// opened file, to be stored in the archive.</param>
+        /// <returns>A readable Stream where the file bytes will be read from
+        /// before they are compressed, or null to skip inclusion of the file and
+        /// continue to the next file.</returns>
+        /// <remarks>
+        /// This method opens a file using the following logic:
+        /// <list>
+        /// <item>If the <see cref="Directory"/> and the <see cref="Files"/> mapping
+        /// are both null, the path is treated as relative to the current directory,
+        /// and that file is opened.</item>
+        /// <item>If the <see cref="Directory"/> is not null but the <see cref="Files"/>
+        /// mapping is null, the path is treated as relative to that directory, and
+        /// that file is opened.</item>
+        /// <item>If the <see cref="Directory"/> is null but the <see cref="Files"/>
+        /// mapping is not null, the path parameter is used as a key into the mapping,
+        /// and the resulting value is the file path that is opened, relative to the
+        /// current directory (or it may be an absolute path). If no mapping exists,
+        /// the file is skipped.</item>
+        /// <item>If both the <see cref="Directory"/> and the <see cref="Files"/>
+        /// mapping are specified, the path parameter is used as a key into the
+        /// mapping, and the resulting value is the file path that is opened, relative
+        /// to the specified directory (or it may be an absolute path). If no mapping
+        /// exists, the file is skipped.</item>
+        /// </list>
+        /// </remarks>
+        public virtual Stream OpenFileReadStream(
+            string path, out FileAttributes attributes, out DateTime lastWriteTime)
+        {
+            string filePath = this.TranslateFilePath(path);
+
+            if (filePath == null)
+            {
+                attributes = FileAttributes.Normal;
+                lastWriteTime = DateTime.Now;
+                return null;
+            }
+
+            attributes = File.GetAttributes(filePath);
+            lastWriteTime = File.GetLastWriteTime(filePath);
+            return File.Open(filePath, FileMode.Open, FileAccess.Read, FileShare.Read);
+        }
+
+        /// <summary>
+        /// Closes a stream that has been used to read a file.
+        /// </summary>
+        /// <param name="path">The path of the file within the archive; the same as
+        /// the path provided when the stream was opened.</param>
+        /// <param name="stream">A stream that was previously returned by
+        /// <see cref="OpenFileReadStream"/> and is now ready to be closed.</param>
+        public virtual void CloseFileReadStream(string path, Stream stream)
+        {
+            if (stream != null)
+            {
+                stream.Close();
+            }
+        }
+
+        /// <summary>
+        /// Gets extended parameter information specific to the compression format
+        /// being used.
+        /// </summary>
+        /// <param name="optionName">Name of the option being requested.</param>
+        /// <param name="parameters">Parameters for the option; for per-file options,
+        /// the first parameter is typically the internal file path.</param>
+        /// <returns>Option value, or null to use the default behavior.</returns>
+        /// <remarks>
+        /// This implementation does not handle any options. Subclasses may override
+        /// this method to allow for non-default behavior.
+        /// </remarks>
+        public virtual object GetOption(string optionName, object[] parameters)
+        {
+            return null;
+        }
+
+        #endregion
+
+        #region IUnpackStreamContext Members
+
+        /// <summary>
+        /// Opens the archive stream for reading.
+        /// </summary>
+        /// <param name="archiveNumber">The zero-based index of the archive to
+        /// open.</param>
+        /// <param name="archiveName">The name of the archive being opened.</param>
+        /// <param name="compressionEngine">Instance of the compression engine
+        /// doing the operations.</param>
+        /// <returns>A stream from which archive bytes are read, or null to cancel
+        /// extraction of the archive.</returns>
+        /// <remarks>
+        /// This method opens the file from the <see cref="ArchiveFiles"/> list with
+        /// the specified index. If the archive number is outside the bounds of the
+        /// list, this method returns null.
+        /// <para>If the <see cref="EnableOffsetOpen"/> flag is set, this method will
+        /// seek to the start of any existing archive in the file, or to the end of
+        /// the file if the existing file is not an archive.</para>
+        /// </remarks>
+        public virtual Stream OpenArchiveReadStream(
+            int archiveNumber, string archiveName, CompressionEngine compressionEngine)
+        {
+            if (archiveNumber >= this.archiveFiles.Count)
+            {
+                return null;
+            }
+
+            string archiveFile = this.archiveFiles[archiveNumber];
+            Stream stream = File.Open(
+                archiveFile, FileMode.Open, FileAccess.Read, FileShare.Read);
+
+            if (this.enableOffsetOpen)
+            {
+                long offset = compressionEngine.FindArchiveOffset(
+                    new DuplicateStream(stream));
+                if (offset > 0)
+                {
+                    stream = new OffsetStream(stream, offset);
+                }
+                else
+                {
+                    stream.Seek(0, SeekOrigin.Begin);
+                }
+            }
+
+            return stream;
+        }
+
+        /// <summary>
+        /// Closes a stream where an archive was read.
+        /// </summary>
+        /// <param name="archiveNumber">The archive number of the stream
+        /// to close.</param>
+        /// <param name="archiveName">The name of the archive being closed.</param>
+        /// <param name="stream">The stream that was previously returned by
+        /// <see cref="OpenArchiveReadStream"/> and is now ready to be closed.</param>
+        public virtual void CloseArchiveReadStream(
+            int archiveNumber, string archiveName, Stream stream)
+        {
+            if (stream != null)
+            {
+                stream.Close();
+            }
+        }
+
+        /// <summary>
+        /// Opens a stream for writing extracted file bytes.
+        /// </summary>
+        /// <param name="path">The path of the file within the archive.</param>
+        /// <param name="fileSize">The uncompressed size of the file to be
+        /// extracted.</param>
+        /// <param name="lastWriteTime">The last write time of the file to be
+        /// extracted.</param>
+        /// <returns>A stream where extracted file bytes are to be written, or null
+        /// to skip extraction of the file and continue to the next file.</returns>
+        /// <remarks>
+        /// This method opens a file using the following logic:
+        /// <list>
+        /// <item>If the <see cref="Directory"/> and the <see cref="Files"/> mapping
+        /// are both null, the path is treated as relative to the current directory,
+        /// and that file is opened.</item>
+        /// <item>If the <see cref="Directory"/> is not null but the <see cref="Files"/>
+        /// mapping is null, the path is treated as relative to that directory, and
+        /// that file is opened.</item>
+        /// <item>If the <see cref="Directory"/> is null but the <see cref="Files"/>
+        /// mapping is not null, the path parameter is used as a key into the mapping,
+        /// and the resulting value is the file path that is opened, relative to the
+        /// current directory (or it may be an absolute path). If no mapping exists,
+        /// the file is skipped.</item>
+        /// <item>If both the <see cref="Directory"/> and the <see cref="Files"/>
+        /// mapping are specified, the path parameter is used as a key into the
+        /// mapping, and the resulting value is the file path that is opened,
+        /// relative to the specified directory (or it may be an absolute path).
+        /// If no mapping exists, the file is skipped.</item>
+        /// </list>
+        /// <para>If the <see cref="ExtractOnlyNewerFiles"/> flag is set, the file
+        /// is skipped if a file currently exists in the same path with an equal
+        /// or newer write time.</para>
+        /// </remarks>
+        public virtual Stream OpenFileWriteStream(
+            string path,
+            long fileSize,
+            DateTime lastWriteTime)
+        {
+            string filePath = this.TranslateFilePath(path);
+
+            if (filePath == null)
+            {
+                return null;
+            }
+
+            FileInfo file = new FileInfo(filePath);
+            if (file.Exists)
+            {
+                if (this.extractOnlyNewerFiles && lastWriteTime != DateTime.MinValue)
+                {
+                    if (file.LastWriteTime >= lastWriteTime)
+                    {
+                        return null;
+                    }
+                }
+
+                // Clear attributes that will prevent overwriting the file.
+                // (The final attributes will be set after the file is unpacked.)
+                FileAttributes attributesToClear =
+                    FileAttributes.ReadOnly | FileAttributes.Hidden | FileAttributes.System;
+                if ((file.Attributes & attributesToClear) != 0)
+                {
+                    file.Attributes &= ~attributesToClear;
+                }
+            }
+
+            if (!file.Directory.Exists)
+            {
+                file.Directory.Create();
+            }
+
+            return File.Open(
+                filePath, FileMode.Create, FileAccess.Write, FileShare.None);
+        }
+
+        /// <summary>
+        /// Closes a stream where an extracted file was written.
+        /// </summary>
+        /// <param name="path">The path of the file within the archive.</param>
+        /// <param name="stream">The stream that was previously returned by
+        /// <see cref="OpenFileWriteStream"/> and is now ready to be closed.</param>
+        /// <param name="attributes">The attributes of the extracted file.</param>
+        /// <param name="lastWriteTime">The last write time of the file.</param>
+        /// <remarks>
+        /// After closing the extracted file stream, this method applies the date
+        /// and attributes to that file.
+        /// </remarks>
+        public virtual void CloseFileWriteStream(
+            string path,
+            Stream stream,
+            FileAttributes attributes,
+            DateTime lastWriteTime)
+        {
+            if (stream != null)
+            {
+                stream.Close();
+            }
+
+            string filePath = this.TranslateFilePath(path);
+            if (filePath != null)
+            {
+                FileInfo file = new FileInfo(filePath);
+
+                if (lastWriteTime != DateTime.MinValue)
+                {
+                    try
+                    {
+                        file.LastWriteTime = lastWriteTime;
+                    }
+                    catch (ArgumentException)
+                    {
+                    }
+                    catch (IOException)
+                    {
+                    }
+                }
+
+                try
+                {
+                    file.Attributes = attributes;
+                }
+                catch (IOException)
+                {
+                }
+            }
+        }
+
+        #endregion
+
+        #region Private utility methods
+
+        /// <summary>
+        /// Translates an internal file path to an external file path using the
+        /// <see cref="Directory"/> and the <see cref="Files"/> mapping, according to
+        /// rules documented in <see cref="OpenFileReadStream"/> and
+        /// <see cref="OpenFileWriteStream"/>.
+        /// </summary>
+        /// <param name="path">The path of the file with the archive.</param>
+        /// <returns>The external path of the file, or null if there is no
+        /// valid translation.</returns>
+        private string TranslateFilePath(string path)
+        {
+            string filePath;
+            if (this.files != null)
+            {
+                filePath = this.files[path];
+            }
+            else
+            {
+                this.ValidateArchivePath(path);
+
+                filePath = path;
+            }
+
+            if (filePath != null)
+            {
+                if (this.directory != null)
+                {
+                    filePath = Path.Combine(this.directory, filePath);
+                }
+            }
+
+            return filePath;
+        }
+
+        private void ValidateArchivePath(string filePath)
+        {
+            string basePath = Path.GetFullPath(String.IsNullOrEmpty(this.directory) ? Environment.CurrentDirectory : this.directory);
+            string path = Path.GetFullPath(Path.Combine(basePath, filePath));
+            if (!path.StartsWith(basePath, StringComparison.InvariantCultureIgnoreCase))
+            {
+                throw new InvalidDataException("Archive cannot contain files with absolute or traversal paths.");
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/ArchiveInfo.cs b/src/dtf/WixToolset.Dtf.Compression/ArchiveInfo.cs
new file mode 100644
index 00000000..b5da4ea8
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/ArchiveInfo.cs
@@ -0,0 +1,781 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.IO;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Text;
+    using System.Text.RegularExpressions;
+    using System.Runtime.Serialization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Abstract object representing a compressed archive on disk;
+    /// provides access to file-based operations on the archive.
+    /// </summary>
+    [Serializable]
+    public abstract class ArchiveInfo : FileSystemInfo
+    {
+        /// <summary>
+        /// Creates a new ArchiveInfo object representing an archive in a
+        /// specified path.
+        /// </summary>
+        /// <param name="path">The path to the archive. When creating an archive,
+        /// this file does not necessarily exist yet.</param>
+        protected ArchiveInfo(string path) : base()
+        {
+            if (path == null)
+            {
+                throw new ArgumentNullException("path");
+            }
+
+            // protected instance members inherited from FileSystemInfo:
+            this.OriginalPath = path;
+            this.FullPath = Path.GetFullPath(path);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the ArchiveInfo class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object
+        /// data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual
+        /// information about the source or destination.</param>
+        protected ArchiveInfo(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        /// <summary>
+        /// Gets the directory that contains the archive.
+        /// </summary>
+        /// <value>A DirectoryInfo object representing the parent directory of the
+        /// archive.</value>
+        public DirectoryInfo Directory
+        {
+            get
+            {
+                return new DirectoryInfo(Path.GetDirectoryName(this.FullName));
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path of the directory that contains the archive.
+        /// </summary>
+        /// <value>The full path of the directory that contains the archive.</value>
+        public string DirectoryName
+        {
+            get
+            {
+                return Path.GetDirectoryName(this.FullName);
+            }
+        }
+
+        /// <summary>
+        /// Gets the size of the archive.
+        /// </summary>
+        /// <value>The size of the archive in bytes.</value>
+        public long Length
+        {
+            get
+            {
+                return new FileInfo(this.FullName).Length;
+            }
+        }
+
+        /// <summary>
+        /// Gets the file name of the archive.
+        /// </summary>
+        /// <value>The file name of the archive, not including any path.</value>
+        public override string Name
+        {
+            get
+            {
+                return Path.GetFileName(this.FullName);
+            }
+        }
+
+        /// <summary>
+        /// Checks if the archive exists.
+        /// </summary>
+        /// <value>True if the archive exists; else false.</value>
+        public override bool Exists
+        {
+            get
+            {
+                return File.Exists(this.FullName);
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path of the archive.
+        /// </summary>
+        /// <returns>The full path of the archive.</returns>
+        public override string ToString()
+        {
+            return this.FullName;
+        }
+
+        /// <summary>
+        /// Deletes the archive.
+        /// </summary>
+        public override void Delete()
+        {
+            File.Delete(this.FullName);
+        }
+
+        /// <summary>
+        /// Copies an existing archive to another location.
+        /// </summary>
+        /// <param name="destFileName">The destination file path.</param>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void CopyTo(string destFileName)
+        {
+            File.Copy(this.FullName, destFileName);
+        }
+
+        /// <summary>
+        /// Copies an existing archive to another location, optionally
+        /// overwriting the destination file.
+        /// </summary>
+        /// <param name="destFileName">The destination file path.</param>
+        /// <param name="overwrite">If true, the destination file will be
+        /// overwritten if it exists.</param>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void CopyTo(string destFileName, bool overwrite)
+        {
+            File.Copy(this.FullName, destFileName, overwrite);
+        }
+        
+        /// <summary>
+        /// Moves an existing archive to another location.
+        /// </summary>
+        /// <param name="destFileName">The destination file path.</param>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void MoveTo(string destFileName)
+        {
+            File.Move(this.FullName, destFileName);
+            this.FullPath = Path.GetFullPath(destFileName);
+        }
+
+        /// <summary>
+        /// Checks if the archive contains a valid archive header.
+        /// </summary>
+        /// <returns>True if the file is a valid archive; false otherwise.</returns>
+        public bool IsValid()
+        {
+            using (Stream stream = File.OpenRead(this.FullName))
+            {
+                using (CompressionEngine compressionEngine = this.CreateCompressionEngine())
+                {
+                    return compressionEngine.FindArchiveOffset(stream) >= 0;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets information about the files contained in the archive.
+        /// </summary>
+        /// <returns>A list of <see cref="ArchiveFileInfo"/> objects, each
+        /// containing information about a file in the archive.</returns>
+        public IList<ArchiveFileInfo> GetFiles()
+        {
+            return this.InternalGetFiles((Predicate<string>) null);
+        }
+
+        /// <summary>
+        /// Gets information about the certain files contained in the archive file.
+        /// </summary>
+        /// <param name="searchPattern">The search string, such as
+        /// &quot;*.txt&quot;.</param>
+        /// <returns>A list of <see cref="ArchiveFileInfo"/> objects, each containing
+        /// information about a file in the archive.</returns>
+        public IList<ArchiveFileInfo> GetFiles(string searchPattern)
+        {
+            if (searchPattern == null)
+            {
+                throw new ArgumentNullException("searchPattern");
+            }
+
+            string regexPattern = String.Format(
+                CultureInfo.InvariantCulture,
+                "^{0}$",
+                Regex.Escape(searchPattern).Replace("\\*", ".*").Replace("\\?", "."));
+            Regex regex = new Regex(
+                    regexPattern,
+                    RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
+
+            return this.InternalGetFiles(
+                delegate(string match)
+                {
+                    return regex.IsMatch(match);
+                });
+        }
+
+        /// <summary>
+        /// Extracts all files from an archive to a destination directory.
+        /// </summary>
+        /// <param name="destDirectory">Directory where the files are to be
+        /// extracted.</param>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void Unpack(string destDirectory)
+        {
+            this.Unpack(destDirectory, null);
+        }
+
+        /// <summary>
+        /// Extracts all files from an archive to a destination directory,
+        /// optionally extracting only newer files.
+        /// </summary>
+        /// <param name="destDirectory">Directory where the files are to be
+        /// extracted.</param>
+        /// <param name="progressHandler">Handler for receiving progress
+        /// information; this may be null if progress is not desired.</param>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void Unpack(
+            string destDirectory,
+            EventHandler<ArchiveProgressEventArgs> progressHandler)
+        {
+            using (CompressionEngine compressionEngine = this.CreateCompressionEngine())
+            {
+                compressionEngine.Progress += progressHandler;
+                ArchiveFileStreamContext streamContext =
+                    new ArchiveFileStreamContext(this.FullName, destDirectory, null);
+                streamContext.EnableOffsetOpen = true;
+                compressionEngine.Unpack(streamContext, null);
+            }
+        }
+
+        /// <summary>
+        /// Extracts a single file from the archive.
+        /// </summary>
+        /// <param name="fileName">The name of the file in the archive. Also
+        /// includes the internal path of the file, if any. File name matching
+        /// is case-insensitive.</param>
+        /// <param name="destFileName">The path where the file is to be
+        /// extracted on disk.</param>
+        /// <remarks>If <paramref name="destFileName"/> already exists,
+        /// it will be overwritten.</remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void UnpackFile(string fileName, string destFileName)
+        {
+            if (fileName == null)
+            {
+                throw new ArgumentNullException("fileName");
+            }
+
+            if (destFileName == null)
+            {
+                throw new ArgumentNullException("destFileName");
+            }
+
+            this.UnpackFiles(
+                new string[] { fileName },
+                null,
+                new string[] { destFileName });
+        }
+
+        /// <summary>
+        /// Extracts multiple files from the archive.
+        /// </summary>
+        /// <param name="fileNames">The names of the files in the archive.
+        /// Each name includes the internal path of the file, if any. File name
+        /// matching is case-insensitive.</param>
+        /// <param name="destDirectory">This parameter may be null, but if
+        /// specified it is the root directory for any relative paths in
+        /// <paramref name="destFileNames"/>.</param>
+        /// <param name="destFileNames">The paths where the files are to be
+        /// extracted on disk. If this parameter is null, the files will be
+        /// extracted with the names from the archive.</param>
+        /// <remarks>
+        /// If any extracted files already exist on disk, they will be overwritten.
+        /// <p>The <paramref name="destDirectory"/> and
+        /// <paramref name="destFileNames"/> parameters cannot both be null.</p>
+        /// </remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void UnpackFiles(
+            IList<string> fileNames,
+            string destDirectory,
+            IList<string> destFileNames)
+        {
+            this.UnpackFiles(fileNames, destDirectory, destFileNames, null);
+        }
+
+        /// <summary>
+        /// Extracts multiple files from the archive, optionally extracting
+        /// only newer files.
+        /// </summary>
+        /// <param name="fileNames">The names of the files in the archive.
+        /// Each name includes the internal path of the file, if any. File name
+        /// matching is case-insensitive.</param>
+        /// <param name="destDirectory">This parameter may be null, but if
+        /// specified it is the root directory for any relative paths in
+        /// <paramref name="destFileNames"/>.</param>
+        /// <param name="destFileNames">The paths where the files are to be
+        /// extracted on disk. If this parameter is null, the files will be
+        /// extracted with the names from the archive.</param>
+        /// <param name="progressHandler">Handler for receiving progress information;
+        /// this may be null if progress is not desired.</param>
+        /// <remarks>
+        /// If any extracted files already exist on disk, they will be overwritten.
+        /// <p>The <paramref name="destDirectory"/> and
+        /// <paramref name="destFileNames"/> parameters cannot both be null.</p>
+        /// </remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void UnpackFiles(
+            IList<string> fileNames,
+            string destDirectory,
+            IList<string> destFileNames,
+            EventHandler<ArchiveProgressEventArgs> progressHandler)
+        {
+            if (fileNames == null)
+            {
+                throw new ArgumentNullException("fileNames");
+            }
+
+            if (destFileNames == null)
+            {
+                if (destDirectory == null)
+                {
+                    throw new ArgumentNullException("destFileNames");
+                }
+
+                destFileNames = fileNames;
+            }
+
+            if (destFileNames.Count != fileNames.Count)
+            {
+                throw new ArgumentOutOfRangeException("destFileNames");
+            }
+
+            IDictionary<string, string> files =
+                ArchiveInfo.CreateStringDictionary(fileNames, destFileNames);
+            this.UnpackFileSet(files, destDirectory, progressHandler);
+        }
+
+        /// <summary>
+        /// Extracts multiple files from the archive.
+        /// </summary>
+        /// <param name="fileNames">A mapping from internal file paths to
+        /// external file paths. Case-senstivity when matching internal paths
+        /// depends on the IDictionary implementation.</param>
+        /// <param name="destDirectory">This parameter may be null, but if
+        /// specified it is the root directory for any relative external paths
+        /// in <paramref name="fileNames"/>.</param>
+        /// <remarks>
+        /// If any extracted files already exist on disk, they will be overwritten.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void UnpackFileSet(
+            IDictionary<string, string> fileNames,
+            string destDirectory)
+        {
+            this.UnpackFileSet(fileNames, destDirectory, null);
+        }
+
+        /// <summary>
+        /// Extracts multiple files from the archive.
+        /// </summary>
+        /// <param name="fileNames">A mapping from internal file paths to
+        /// external file paths. Case-senstivity when matching internal
+        /// paths depends on the IDictionary implementation.</param>
+        /// <param name="destDirectory">This parameter may be null, but if
+        /// specified it is the root directory for any relative external
+        /// paths in <paramref name="fileNames"/>.</param>
+        /// <param name="progressHandler">Handler for receiving progress
+        /// information; this may be null if progress is not desired.</param>
+        /// <remarks>
+        /// If any extracted files already exist on disk, they will be overwritten.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "dest")]
+        public void UnpackFileSet(
+            IDictionary<string, string> fileNames,
+            string destDirectory,
+            EventHandler<ArchiveProgressEventArgs> progressHandler)
+        {
+            if (fileNames == null)
+            {
+                throw new ArgumentNullException("fileNames");
+            }
+
+            using (CompressionEngine compressionEngine = this.CreateCompressionEngine())
+            {
+                compressionEngine.Progress += progressHandler;
+                ArchiveFileStreamContext streamContext =
+                    new ArchiveFileStreamContext(this.FullName, destDirectory, fileNames);
+                streamContext.EnableOffsetOpen = true;
+                compressionEngine.Unpack(
+                    streamContext,
+                    delegate(string match)
+                    {
+                        return fileNames.ContainsKey(match);
+                    });
+            }
+        }
+
+        /// <summary>
+        /// Opens a file inside the archive for reading without actually
+        /// extracting the file to disk.
+        /// </summary>
+        /// <param name="fileName">The name of the file in the archive. Also
+        /// includes the internal path of the file, if any. File name matching
+        /// is case-insensitive.</param>
+        /// <returns>
+        /// A stream for reading directly from the packed file. Like any stream
+        /// this should be closed/disposed as soon as it is no longer needed.
+        /// </returns>
+        public Stream OpenRead(string fileName)
+        {
+            Stream archiveStream = File.OpenRead(this.FullName);
+            CompressionEngine compressionEngine = this.CreateCompressionEngine();
+            Stream fileStream = compressionEngine.Unpack(archiveStream, fileName);
+
+            // Attach the archiveStream and compressionEngine to the
+            // fileStream so they get disposed when the fileStream is disposed.
+            return new CargoStream(fileStream, archiveStream, compressionEngine);
+        }
+
+        /// <summary>
+        /// Opens a file inside the archive for reading text with UTF-8 encoding
+        /// without actually extracting the file to disk.
+        /// </summary>
+        /// <param name="fileName">The name of the file in the archive. Also
+        /// includes the internal path of the file, if any. File name matching
+        /// is case-insensitive.</param>
+        /// <returns>
+        /// A reader for reading text directly from the packed file. Like any reader
+        /// this should be closed/disposed as soon as it is no longer needed.
+        /// </returns>
+        /// <remarks>
+        /// To open an archived text file with different encoding, use the
+        /// <see cref="OpenRead" /> method and pass the returned stream to one of
+        /// the <see cref="StreamReader" /> constructor overloads.
+        /// </remarks>
+        public StreamReader OpenText(string fileName)
+        {
+            return new StreamReader(this.OpenRead(fileName));
+        }
+
+        /// <summary>
+        /// Compresses all files in a directory into the archive.
+        /// Does not include subdirectories.
+        /// </summary>
+        /// <param name="sourceDirectory">The directory containing the
+        /// files to be included.</param>
+        /// <remarks>
+        /// Uses maximum compression level.
+        /// </remarks>
+        public void Pack(string sourceDirectory)
+        {
+            this.Pack(sourceDirectory, false, CompressionLevel.Max, null);
+        }
+
+        /// <summary>
+        /// Compresses all files in a directory into the archive, optionally
+        /// including subdirectories.
+        /// </summary>
+        /// <param name="sourceDirectory">This is the root directory
+        /// for to pack all files.</param>
+        /// <param name="includeSubdirectories">If true, recursively include
+        /// files in subdirectories.</param>
+        /// <param name="compLevel">The compression level used when creating
+        /// the archive.</param>
+        /// <param name="progressHandler">Handler for receiving progress information;
+        /// this may be null if progress is not desired.</param>
+        /// <remarks>
+        /// The files are stored in the archive using their relative file paths in
+        /// the directory tree, if supported by the archive file format.
+        /// </remarks>
+        public void Pack(
+            string sourceDirectory,
+            bool includeSubdirectories,
+            CompressionLevel compLevel,
+            EventHandler<ArchiveProgressEventArgs> progressHandler)
+        {
+            IList<string> files = this.GetRelativeFilePathsInDirectoryTree(
+                sourceDirectory, includeSubdirectories);
+            this.PackFiles(sourceDirectory, files, files, compLevel, progressHandler);
+        }
+
+        /// <summary>
+        /// Compresses files into the archive, specifying the names used to
+        /// store the files in the archive.
+        /// </summary>
+        /// <param name="sourceDirectory">This parameter may be null, but
+        /// if specified it is the root directory
+        /// for any relative paths in <paramref name="sourceFileNames"/>.</param>
+        /// <param name="sourceFileNames">The list of files to be included in
+        /// the archive.</param>
+        /// <param name="fileNames">The names of the files as they are stored
+        /// in the archive. Each name
+        /// includes the internal path of the file, if any. This parameter may
+        /// be null, in which case the files are stored in the archive with their
+        /// source file names and no path information.</param>
+        /// <remarks>
+        /// Uses maximum compression level.
+        /// <p>Duplicate items in the <paramref name="fileNames"/> array will cause
+        /// an <see cref="ArchiveException"/>.</p>
+        /// </remarks>
+        public void PackFiles(
+            string sourceDirectory,
+            IList<string> sourceFileNames,
+            IList<string> fileNames)
+        {
+            this.PackFiles(
+                sourceDirectory,
+                sourceFileNames,
+                fileNames,
+                CompressionLevel.Max,
+                null);
+        }
+
+        /// <summary>
+        /// Compresses files into the archive, specifying the names used to
+        /// store the files in the archive.
+        /// </summary>
+        /// <param name="sourceDirectory">This parameter may be null, but if
+        /// specified it is the root directory
+        /// for any relative paths in <paramref name="sourceFileNames"/>.</param>
+        /// <param name="sourceFileNames">The list of files to be included in
+        /// the archive.</param>
+        /// <param name="fileNames">The names of the files as they are stored in
+        /// the archive. Each name includes the internal path of the file, if any.
+        /// This parameter may be null, in which case the files are stored in the
+        /// archive with their source file names and no path information.</param>
+        /// <param name="compLevel">The compression level used when creating the
+        /// archive.</param>
+        /// <param name="progressHandler">Handler for receiving progress information;
+        /// this may be null if progress is not desired.</param>
+        /// <remarks>
+        /// Duplicate items in the <paramref name="fileNames"/> array will cause
+        /// an <see cref="ArchiveException"/>.
+        /// </remarks>
+        public void PackFiles(
+            string sourceDirectory,
+            IList<string> sourceFileNames,
+            IList<string> fileNames,
+            CompressionLevel compLevel,
+            EventHandler<ArchiveProgressEventArgs> progressHandler)
+        {
+            if (sourceFileNames == null)
+            {
+                throw new ArgumentNullException("sourceFileNames");
+            }
+
+            if (fileNames == null)
+            {
+                string[] fileNamesArray = new string[sourceFileNames.Count];
+                for (int i = 0; i < sourceFileNames.Count; i++)
+                {
+                    fileNamesArray[i] = Path.GetFileName(sourceFileNames[i]);
+                }
+
+                fileNames = fileNamesArray;
+            }
+            else if (fileNames.Count != sourceFileNames.Count)
+            {
+                throw new ArgumentOutOfRangeException("fileNames");
+            }
+
+            using (CompressionEngine compressionEngine = this.CreateCompressionEngine())
+            {
+                compressionEngine.Progress += progressHandler;
+                IDictionary<string, string> contextFiles =
+                    ArchiveInfo.CreateStringDictionary(fileNames, sourceFileNames);
+                ArchiveFileStreamContext streamContext = new ArchiveFileStreamContext(
+                        this.FullName, sourceDirectory, contextFiles);
+                streamContext.EnableOffsetOpen = true;
+                compressionEngine.CompressionLevel = compLevel;
+                compressionEngine.Pack(streamContext, fileNames);
+            }
+        }
+
+        /// <summary>
+        /// Compresses files into the archive, specifying the names used
+        /// to store the files in the archive.
+        /// </summary>
+        /// <param name="sourceDirectory">This parameter may be null, but if
+        /// specified it is the root directory
+        /// for any relative paths in <paramref name="fileNames"/>.</param>
+        /// <param name="fileNames">A mapping from internal file paths to
+        /// external file paths.</param>
+        /// <remarks>
+        /// Uses maximum compression level.
+        /// </remarks>
+        public void PackFileSet(
+            string sourceDirectory,
+            IDictionary<string, string> fileNames)
+        {
+            this.PackFileSet(sourceDirectory, fileNames, CompressionLevel.Max, null);
+        }
+
+        /// <summary>
+        /// Compresses files into the archive, specifying the names used to
+        /// store the files in the archive.
+        /// </summary>
+        /// <param name="sourceDirectory">This parameter may be null, but if
+        /// specified it is the root directory
+        /// for any relative paths in <paramref name="fileNames"/>.</param>
+        /// <param name="fileNames">A mapping from internal file paths to
+        /// external file paths.</param>
+        /// <param name="compLevel">The compression level used when creating
+        /// the archive.</param>
+        /// <param name="progressHandler">Handler for receiving progress information;
+        /// this may be null if progress is not desired.</param>
+        public void PackFileSet(
+            string sourceDirectory,
+            IDictionary<string, string> fileNames,
+            CompressionLevel compLevel,
+            EventHandler<ArchiveProgressEventArgs> progressHandler)
+        {
+            if (fileNames == null)
+            {
+                throw new ArgumentNullException("fileNames");
+            }
+
+            string[] fileNamesArray = new string[fileNames.Count];
+            fileNames.Keys.CopyTo(fileNamesArray, 0);
+
+            using (CompressionEngine compressionEngine = this.CreateCompressionEngine())
+            {
+                compressionEngine.Progress += progressHandler;
+                ArchiveFileStreamContext streamContext = new ArchiveFileStreamContext(
+                        this.FullName, sourceDirectory, fileNames);
+                streamContext.EnableOffsetOpen = true;
+                compressionEngine.CompressionLevel = compLevel;
+                compressionEngine.Pack(streamContext, fileNamesArray);
+            }
+        }
+
+        /// <summary>
+        /// Given a directory, gets the relative paths of all files in the
+        /// directory, optionally including all subdirectories.
+        /// </summary>
+        /// <param name="dir">The directory to search.</param>
+        /// <param name="includeSubdirectories">True to include subdirectories
+        /// in the search.</param>
+        /// <returns>A list of file paths relative to the directory.</returns>
+        internal IList<string> GetRelativeFilePathsInDirectoryTree(
+            string dir, bool includeSubdirectories)
+        {
+            IList<string> fileList = new List<string>();
+            this.RecursiveGetRelativeFilePathsInDirectoryTree(
+                dir, String.Empty, includeSubdirectories, fileList);
+            return fileList;
+        }
+
+        /// <summary>
+        /// Retrieves information about one file from this archive.
+        /// </summary>
+        /// <param name="path">Path of the file in the archive.</param>
+        /// <returns>File information, or null if the file was not found
+        /// in the archive.</returns>
+        internal ArchiveFileInfo GetFile(string path)
+        {
+            IList<ArchiveFileInfo> files = this.InternalGetFiles(
+                delegate(string match)
+                {
+                    return String.Compare(
+                        match, path, true, CultureInfo.InvariantCulture) == 0;
+                });
+            return (files != null && files.Count > 0 ? files[0] : null);
+        }
+
+        /// <summary>
+        /// Creates a compression engine that does the low-level work for
+        /// this object.
+        /// </summary>
+        /// <returns>A new compression engine instance that matches the specific
+        /// subclass of archive.</returns>
+        /// <remarks>
+        /// Each instance will be <see cref="CompressionEngine.Dispose()"/>d
+        /// immediately after use.
+        /// </remarks>
+        protected abstract CompressionEngine CreateCompressionEngine();
+
+        /// <summary>
+        /// Creates a case-insensitive dictionary mapping from one list of
+        /// strings to the other.
+        /// </summary>
+        /// <param name="keys">List of keys.</param>
+        /// <param name="values">List of values that are mapped 1-to-1 to
+        /// the keys.</param>
+        /// <returns>A filled dictionary of the strings.</returns>
+        private static IDictionary<string, string> CreateStringDictionary(
+            IList<string> keys, IList<string> values)
+        {
+            IDictionary<string, string> stringDict =
+                new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            for (int i = 0; i < keys.Count; i++)
+            {
+                stringDict.Add(keys[i], values[i]);
+            }
+
+            return stringDict;
+        }
+
+        /// <summary>
+        /// Recursive-descent helper function for
+        /// GetRelativeFilePathsInDirectoryTree.
+        /// </summary>
+        /// <param name="dir">The root directory of the search.</param>
+        /// <param name="relativeDir">The relative directory to be
+        /// processed now.</param>
+        /// <param name="includeSubdirectories">True to descend into
+        /// subdirectories.</param>
+        /// <param name="fileList">List of files found so far.</param>
+        private void RecursiveGetRelativeFilePathsInDirectoryTree(
+            string dir,
+            string relativeDir,
+            bool includeSubdirectories,
+            IList<string> fileList)
+        {
+            foreach (string file in System.IO.Directory.GetFiles(dir))
+            {
+                string fileName = Path.GetFileName(file);
+                fileList.Add(Path.Combine(relativeDir, fileName));
+            }
+
+            if (includeSubdirectories)
+            {
+                foreach (string subDir in System.IO.Directory.GetDirectories(dir))
+                {
+                    string subDirName = Path.GetFileName(subDir);
+                    this.RecursiveGetRelativeFilePathsInDirectoryTree(
+                        Path.Combine(dir, subDirName),
+                        Path.Combine(relativeDir, subDirName),
+                        includeSubdirectories,
+                        fileList);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Uses a CompressionEngine to get ArchiveFileInfo objects from this
+        /// archive, and then associates them with this ArchiveInfo instance.
+        /// </summary>
+        /// <param name="fileFilter">Optional predicate that can determine
+        /// which files to process.</param>
+        /// <returns>A list of <see cref="ArchiveFileInfo"/> objects, each
+        /// containing information about a file in the archive.</returns>
+        private IList<ArchiveFileInfo> InternalGetFiles(Predicate<string> fileFilter)
+        {
+            using (CompressionEngine compressionEngine = this.CreateCompressionEngine())
+            {
+                ArchiveFileStreamContext streamContext =
+                    new ArchiveFileStreamContext(this.FullName, null, null);
+                streamContext.EnableOffsetOpen = true;
+                IList<ArchiveFileInfo> files =
+                    compressionEngine.GetFileInfo(streamContext, fileFilter);
+                for (int i = 0; i < files.Count; i++)
+                {
+                    files[i].Archive = this;
+                }
+
+                return files;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/ArchiveProgressEventArgs.cs b/src/dtf/WixToolset.Dtf.Compression/ArchiveProgressEventArgs.cs
new file mode 100644
index 00000000..5d96d714
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/ArchiveProgressEventArgs.cs
@@ -0,0 +1,307 @@
+// 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.Dtf.Compression
+{
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+    /// <summary>
+    /// Contains the data reported in an archive progress event.
+    /// </summary>
+    public class ArchiveProgressEventArgs : EventArgs
+    {
+        private ArchiveProgressType progressType;
+
+        private string currentFileName;
+        private int currentFileNumber;
+        private int totalFiles;
+        private long currentFileBytesProcessed;
+        private long currentFileTotalBytes;
+
+        private string currentArchiveName;
+        private short currentArchiveNumber;
+        private short totalArchives;
+        private long currentArchiveBytesProcessed;
+        private long currentArchiveTotalBytes;
+
+        private long fileBytesProcessed;
+        private long totalFileBytes;
+
+        /// <summary>
+        /// Creates a new ArchiveProgressEventArgs object from specified event parameters.
+        /// </summary>
+        /// <param name="progressType">type of status message</param>
+        /// <param name="currentFileName">name of the file being processed</param>
+        /// <param name="currentFileNumber">number of the current file being processed</param>
+        /// <param name="totalFiles">total number of files to be processed</param>
+        /// <param name="currentFileBytesProcessed">number of bytes processed so far when compressing or extracting a file</param>
+        /// <param name="currentFileTotalBytes">total number of bytes in the current file</param>
+        /// <param name="currentArchiveName">name of the current Archive</param>
+        /// <param name="currentArchiveNumber">current Archive number, when processing a chained set of Archives</param>
+        /// <param name="totalArchives">total number of Archives in a chained set</param>
+        /// <param name="currentArchiveBytesProcessed">number of compressed bytes processed so far during an extraction</param>
+        /// <param name="currentArchiveTotalBytes">total number of compressed bytes to be processed during an extraction</param>
+        /// <param name="fileBytesProcessed">number of uncompressed file bytes processed so far</param>
+        /// <param name="totalFileBytes">total number of uncompressed file bytes to be processed</param>
+        public ArchiveProgressEventArgs(
+            ArchiveProgressType progressType,
+            string currentFileName,
+            int currentFileNumber,
+            int totalFiles,
+            long currentFileBytesProcessed,
+            long currentFileTotalBytes,
+            string currentArchiveName,
+            int currentArchiveNumber,
+            int totalArchives,
+            long currentArchiveBytesProcessed,
+            long currentArchiveTotalBytes,
+            long fileBytesProcessed,
+            long totalFileBytes)
+        {
+            this.progressType = progressType;
+            this.currentFileName = currentFileName;
+            this.currentFileNumber = currentFileNumber;
+            this.totalFiles = totalFiles;
+            this.currentFileBytesProcessed = currentFileBytesProcessed;
+            this.currentFileTotalBytes = currentFileTotalBytes;
+            this.currentArchiveName = currentArchiveName;
+            this.currentArchiveNumber = (short) currentArchiveNumber;
+            this.totalArchives = (short) totalArchives;
+            this.currentArchiveBytesProcessed = currentArchiveBytesProcessed;
+            this.currentArchiveTotalBytes = currentArchiveTotalBytes;
+            this.fileBytesProcessed = fileBytesProcessed;
+            this.totalFileBytes = totalFileBytes;
+        }
+
+        /// <summary>
+        /// Gets the type of status message.
+        /// </summary>
+        /// <value>A <see cref="ArchiveProgressType"/> value indicating what type of progress event occurred.</value>
+        /// <remarks>
+        /// The handler may choose to ignore some types of progress events.
+        /// For example, if the handler will only list each file as it is
+        /// compressed/extracted, it can ignore events that
+        /// are not of type <see cref="ArchiveProgressType.FinishFile"/>.
+        /// </remarks>
+        public ArchiveProgressType ProgressType
+        {
+            get
+            {
+                return this.progressType;
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the file being processed. (The name of the file within the Archive; not the external
+        /// file path.) Also includes the internal path of the file, if any.  Valid for
+        /// <see cref="ArchiveProgressType.StartFile"/>, <see cref="ArchiveProgressType.PartialFile"/>,
+        /// and <see cref="ArchiveProgressType.FinishFile"/> messages.
+        /// </summary>
+        /// <value>The name of the file currently being processed, or null if processing
+        /// is currently at the stream or archive level.</value>
+        public string CurrentFileName
+        {
+            get
+            {
+                return this.currentFileName;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of the current file being processed. The first file is number 0, and the last file
+        /// is <see cref="TotalFiles"/>-1. Valid for <see cref="ArchiveProgressType.StartFile"/>,
+        /// <see cref="ArchiveProgressType.PartialFile"/>, and <see cref="ArchiveProgressType.FinishFile"/> messages.
+        /// </summary>
+        /// <value>The number of the file currently being processed, or the most recent
+        /// file processed if processing is currently at the stream or archive level.</value>
+        public int CurrentFileNumber
+        {
+            get
+            {
+                return this.currentFileNumber;
+            }
+        }
+
+        /// <summary>
+        /// Gets the total number of files to be processed.  Valid for all message types.
+        /// </summary>
+        /// <value>The total number of files to be processed that are known so far.</value>
+        public int TotalFiles
+        {
+            get
+            {
+                return this.totalFiles;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of bytes processed so far when compressing or extracting a file.  Valid for
+        /// <see cref="ArchiveProgressType.StartFile"/>, <see cref="ArchiveProgressType.PartialFile"/>,
+        /// and <see cref="ArchiveProgressType.FinishFile"/> messages.
+        /// </summary>
+        /// <value>The number of uncompressed bytes processed so far for the current file,
+        /// or 0 if processing is currently at the stream or archive level.</value>
+        public long CurrentFileBytesProcessed
+        {
+            get
+            {
+                return this.currentFileBytesProcessed;
+            }
+        }
+
+        /// <summary>
+        /// Gets the total number of bytes in the current file.  Valid for <see cref="ArchiveProgressType.StartFile"/>,
+        /// <see cref="ArchiveProgressType.PartialFile"/>, and <see cref="ArchiveProgressType.FinishFile"/> messages.
+        /// </summary>
+        /// <value>The uncompressed size of the current file being processed,
+        /// or 0 if processing is currently at the stream or archive level.</value>
+        public long CurrentFileTotalBytes
+        {
+            get
+            {
+                return this.currentFileTotalBytes;
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the current archive.  Not necessarily the name of the archive on disk.
+        /// Valid for all message types.
+        /// </summary>
+        /// <value>The name of the current archive, or an empty string if no name was specified.</value>
+        public string CurrentArchiveName
+        {
+            get
+            {
+                return this.currentArchiveName;
+            }
+        }
+
+        /// <summary>
+        /// Gets the current archive number, when processing a chained set of archives. Valid for all message types.
+        /// </summary>
+        /// <value>The number of the current archive.</value>
+        /// <remarks>The first archive is number 0, and the last archive is
+        /// <see cref="TotalArchives"/>-1.</remarks>
+        public int CurrentArchiveNumber
+        {
+            get
+            {
+                return this.currentArchiveNumber;
+            }
+        }
+
+        /// <summary>
+        /// Gets the total number of known archives in a chained set. Valid for all message types.
+        /// </summary>
+        /// <value>The total number of known archives in a chained set.</value>
+        /// <remarks>
+        /// When using the compression option to auto-split into multiple archives based on data size,
+        /// this value will not be accurate until the end.
+        /// </remarks>
+        public int TotalArchives
+        {
+            get
+            {
+                return this.totalArchives;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of compressed bytes processed so far during extraction
+        /// of the current archive. Valid for all extraction messages.
+        /// </summary>
+        /// <value>The number of compressed bytes processed so far during extraction
+        /// of the current archive.</value>
+        public long CurrentArchiveBytesProcessed
+        {
+            get
+            {
+                return this.currentArchiveBytesProcessed;
+            }
+        }
+
+        /// <summary>
+        /// Gets the total number of compressed bytes to be processed during extraction
+        /// of the current archive. Valid for all extraction messages.
+        /// </summary>
+        /// <value>The total number of compressed bytes to be processed during extraction
+        /// of the current archive.</value>
+        public long CurrentArchiveTotalBytes
+        {
+            get
+            {
+                return this.currentArchiveTotalBytes;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of uncompressed bytes processed so far among all files. Valid for all message types.  
+        /// </summary>
+        /// <value>The number of uncompressed file bytes processed so far among all files.</value>
+        /// <remarks>
+        /// When compared to <see cref="TotalFileBytes"/>, this can be used as a measure of overall progress.
+        /// </remarks>
+        public long FileBytesProcessed
+        {
+            get
+            {
+                return this.fileBytesProcessed;
+            }
+        }
+
+        /// <summary>
+        /// Gets the total number of uncompressed file bytes to be processed.  Valid for all message types.
+        /// </summary>
+        /// <value>The total number of uncompressed bytes to be processed among all files.</value>
+        public long TotalFileBytes
+        {
+            get
+            {
+                return this.totalFileBytes;
+            }
+        }
+
+#if DEBUG
+
+    /// <summary>
+    /// Creates a string representation of the progress event.
+    /// </summary>
+    /// <returns>a listing of all event parameters and values</returns>
+    public override string ToString()
+    {
+        string formatString =
+            "{0}\n" +
+            "\t CurrentFileName              = {1}\n" +
+            "\t CurrentFileNumber            = {2}\n" +
+            "\t TotalFiles                   = {3}\n" +
+            "\t CurrentFileBytesProcessed    = {4}\n" +
+            "\t CurrentFileTotalBytes        = {5}\n" +
+            "\t CurrentArchiveName           = {6}\n" +
+            "\t CurrentArchiveNumber         = {7}\n" +
+            "\t TotalArchives                = {8}\n" +
+            "\t CurrentArchiveBytesProcessed = {9}\n" +
+            "\t CurrentArchiveTotalBytes     = {10}\n" +
+            "\t FileBytesProcessed           = {11}\n" +
+            "\t TotalFileBytes               = {12}\n";
+        return String.Format(
+            System.Globalization.CultureInfo.InvariantCulture,
+            formatString,
+            this.ProgressType,
+            this.CurrentFileName,
+            this.CurrentFileNumber,
+            this.TotalFiles,
+            this.CurrentFileBytesProcessed,
+            this.CurrentFileTotalBytes,
+            this.CurrentArchiveName,
+            this.CurrentArchiveNumber,
+            this.TotalArchives,
+            this.CurrentArchiveBytesProcessed,
+            this.CurrentArchiveTotalBytes,
+            this.FileBytesProcessed,
+            this.TotalFileBytes);
+    }
+
+#endif
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/ArchiveProgressType.cs b/src/dtf/WixToolset.Dtf.Compression/ArchiveProgressType.cs
new file mode 100644
index 00000000..2307c28e
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/ArchiveProgressType.cs
@@ -0,0 +1,69 @@
+// 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.Dtf.Compression
+{
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+    /// <summary>
+    /// The type of progress event.
+    /// </summary>
+    /// <remarks>
+    /// <p>PACKING EXAMPLE: The following sequence of events might be received when
+    /// extracting a simple archive file with 2 files.</p>
+    /// <list type="table">
+    /// <listheader><term>Message Type</term><description>Description</description></listheader>
+    /// <item><term>StartArchive</term> <description>Begin extracting archive</description></item>
+    /// <item><term>StartFile</term>    <description>Begin extracting first file</description></item>
+    /// <item><term>PartialFile</term>  <description>Extracting first file</description></item>
+    /// <item><term>PartialFile</term>  <description>Extracting first file</description></item>
+    /// <item><term>FinishFile</term>   <description>Finished extracting first file</description></item>
+    /// <item><term>StartFile</term>    <description>Begin extracting second file</description></item>
+    /// <item><term>PartialFile</term>  <description>Extracting second file</description></item>
+    /// <item><term>FinishFile</term>   <description>Finished extracting second file</description></item>
+    /// <item><term>FinishArchive</term><description>Finished extracting archive</description></item>
+    /// </list>
+    /// <p></p>
+    /// <p>UNPACKING EXAMPLE:  Packing 3 files into 2 archive chunks, where the second file is
+    /// continued to the second archive chunk.</p>
+    /// <list type="table">
+    /// <listheader><term>Message Type</term><description>Description</description></listheader>
+    /// <item><term>StartFile</term>     <description>Begin compressing first file</description></item>
+    /// <item><term>FinishFile</term>    <description>Finished compressing first file</description></item>
+    /// <item><term>StartFile</term>     <description>Begin compressing second file</description></item>
+    /// <item><term>PartialFile</term>   <description>Compressing second file</description></item>
+    /// <item><term>PartialFile</term>   <description>Compressing second file</description></item>
+    /// <item><term>FinishFile</term>    <description>Finished compressing second file</description></item>
+    /// <item><term>StartArchive</term>  <description>Begin writing first archive</description></item>
+    /// <item><term>PartialArchive</term><description>Writing first archive</description></item>
+    /// <item><term>FinishArchive</term> <description>Finished writing first archive</description></item>
+    /// <item><term>StartFile</term>     <description>Begin compressing third file</description></item>
+    /// <item><term>PartialFile</term>   <description>Compressing third file</description></item>
+    /// <item><term>FinishFile</term>    <description>Finished compressing third file</description></item>
+    /// <item><term>StartArchive</term>  <description>Begin writing second archive</description></item>
+    /// <item><term>PartialArchive</term><description>Writing second archive</description></item>
+    /// <item><term>FinishArchive</term> <description>Finished writing second archive</description></item>
+    /// </list>
+    /// </remarks>
+    public enum ArchiveProgressType : int
+    {
+        /// <summary>Status message before beginning the packing or unpacking an individual file.</summary>
+        StartFile,
+
+        /// <summary>Status message (possibly reported multiple times) during the process of packing or unpacking a file.</summary>
+        PartialFile,
+
+        /// <summary>Status message after completion of the packing or unpacking an individual file.</summary>
+        FinishFile,
+
+        /// <summary>Status message before beginning the packing or unpacking an archive.</summary>
+        StartArchive,
+
+        /// <summary>Status message (possibly reported multiple times) during the process of packing or unpacking an archiv.</summary>
+        PartialArchive,
+
+        /// <summary>Status message after completion of the packing or unpacking of an archive.</summary>
+        FinishArchive,
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/BasicUnpackStreamContext.cs b/src/dtf/WixToolset.Dtf.Compression/BasicUnpackStreamContext.cs
new file mode 100644
index 00000000..94d13b9c
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/BasicUnpackStreamContext.cs
@@ -0,0 +1,90 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.IO;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Stream context used to extract a single file from an archive into a memory stream.
+    /// </summary>
+    [SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable")]
+    public class BasicUnpackStreamContext : IUnpackStreamContext
+    {
+        private Stream archiveStream;
+        private Stream fileStream;
+
+        /// <summary>
+        /// Creates a new BasicExtractStreamContext that reads from the specified archive stream.
+        /// </summary>
+        /// <param name="archiveStream">Archive stream to read from.</param>
+        public BasicUnpackStreamContext(Stream archiveStream)
+        {
+            this.archiveStream = archiveStream;
+        }
+
+        /// <summary>
+        /// Gets the stream for the extracted file, or null if no file was extracted.
+        /// </summary>
+        public Stream FileStream
+        {
+            get
+            {
+                return this.fileStream;
+            }
+        }
+
+        /// <summary>
+        /// Opens the archive stream for reading. Returns a DuplicateStream instance,
+        /// so the stream may be virtually opened multiple times.
+        /// </summary>
+        /// <param name="archiveNumber">The archive number to open (ignored; 0 is assumed).</param>
+        /// <param name="archiveName">The name of the archive being opened.</param>
+        /// <param name="compressionEngine">Instance of the compression engine doing the operations.</param>
+        /// <returns>A stream from which archive bytes are read.</returns>
+        public Stream OpenArchiveReadStream(int archiveNumber, string archiveName, CompressionEngine compressionEngine)
+        {
+            return new DuplicateStream(this.archiveStream);
+        }
+
+        /// <summary>
+        /// Does *not* close the stream. The archive stream should be managed by
+        /// the code that invokes the archive extraction.
+        /// </summary>
+        /// <param name="archiveNumber">The archive number of the stream to close.</param>
+        /// <param name="archiveName">The name of the archive being closed.</param>
+        /// <param name="stream">The stream being closed.</param>
+        public void CloseArchiveReadStream(int archiveNumber, string archiveName, Stream stream)
+        {
+            // Do nothing.
+        }
+
+        /// <summary>
+        /// Opens a stream for writing extracted file bytes. The returned stream is a MemoryStream
+        /// instance, so the file is extracted straight into memory.
+        /// </summary>
+        /// <param name="path">Path of the file within the archive.</param>
+        /// <param name="fileSize">The uncompressed size of the file to be extracted.</param>
+        /// <param name="lastWriteTime">The last write time of the file.</param>
+        /// <returns>A stream where extracted file bytes are to be written.</returns>
+        public Stream OpenFileWriteStream(string path, long fileSize, DateTime lastWriteTime)
+        {
+            this.fileStream = new MemoryStream(new byte[fileSize], 0, (int) fileSize, true, true);
+            return this.fileStream;
+        }
+
+        /// <summary>
+        /// Does *not* close the file stream. The file stream is saved in memory so it can
+        /// be read later.
+        /// </summary>
+        /// <param name="path">Path of the file within the archive.</param>
+        /// <param name="stream">The file stream to be closed.</param>
+        /// <param name="attributes">The attributes of the extracted file.</param>
+        /// <param name="lastWriteTime">The last write time of the file.</param>
+        public void CloseFileWriteStream(string path, Stream stream, FileAttributes attributes, DateTime lastWriteTime)
+        {
+            // Do nothing.
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/CargoStream.cs b/src/dtf/WixToolset.Dtf.Compression/CargoStream.cs
new file mode 100644
index 00000000..78798a35
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/CargoStream.cs
@@ -0,0 +1,192 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+
+    /// <summary>
+    /// Wraps a source stream and carries additional items that are disposed when the stream is closed.
+    /// </summary>
+    public class CargoStream : Stream
+    {
+        private Stream source;
+        private List<IDisposable> cargo;
+
+        /// <summary>
+        /// Creates a new a cargo stream.
+        /// </summary>
+        /// <param name="source">source of the stream</param>
+        /// <param name="cargo">List of additional items that are disposed when the stream is closed.
+        /// The order of the list is the order in which the items are disposed.</param>
+        public CargoStream(Stream source, params IDisposable[] cargo)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException("source");
+            }
+
+            this.source = source;
+            this.cargo = new List<IDisposable>(cargo);
+        }
+
+        /// <summary>
+        /// Gets the source stream of the cargo stream.
+        /// </summary>
+        public Stream Source
+        {
+            get
+            {
+                return this.source;
+            }
+        }
+
+        /// <summary>
+        /// Gets the list of additional items that are disposed when the stream is closed.
+        /// The order of the list is the order in which the items are disposed. The contents can be modified any time.
+        /// </summary>
+        public IList<IDisposable> Cargo
+        {
+            get
+            {
+                return this.cargo;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports reading.
+        /// </summary>
+        /// <value>true if the stream supports reading; otherwise, false.</value>
+        public override bool CanRead
+        {
+            get
+            {
+                return this.source.CanRead;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports writing.
+        /// </summary>
+        /// <value>true if the stream supports writing; otherwise, false.</value>
+        public override bool CanWrite
+        {
+            get
+            {
+                return this.source.CanWrite;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports seeking.
+        /// </summary>
+        /// <value>true if the stream supports seeking; otherwise, false.</value>
+        public override bool CanSeek
+        {
+            get
+            {
+                return this.source.CanSeek;
+            }
+        }
+
+        /// <summary>
+        /// Gets the length of the source stream.
+        /// </summary>
+        public override long Length
+        {
+            get
+            {
+                return this.source.Length;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the position of the source stream.
+        /// </summary>
+        public override long Position
+        {
+            get
+            {
+                return this.source.Position;
+            }
+
+            set
+            {
+                this.source.Position = value;
+            }
+        }
+
+        /// <summary>
+        /// Flushes the source stream.
+        /// </summary>
+        public override void Flush()
+        {
+            this.source.Flush();
+        }
+
+        /// <summary>
+        /// Sets the length of the source stream.
+        /// </summary>
+        /// <param name="value">The desired length of the stream in bytes.</param>
+        public override void SetLength(long value)
+        {
+            this.source.SetLength(value);
+        }
+
+        /// <summary>
+        /// Closes the source stream and also closes the additional objects that are carried.
+        /// </summary>
+        public override void Close()
+        {
+            this.source.Close();
+
+            foreach (IDisposable cargoObject in this.cargo)
+            {
+                cargoObject.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Reads from the source stream.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. When this method returns, the buffer
+        /// contains the specified byte array with the values between offset and
+        /// (offset + count - 1) replaced by the bytes read from the source.</param>
+        /// <param name="offset">The zero-based byte offset in buffer at which to begin
+        /// storing the data read from the stream.</param>
+        /// <param name="count">The maximum number of bytes to be read from the stream.</param>
+        /// <returns>The total number of bytes read into the buffer. This can be less
+        /// than the number of bytes requested if that many bytes are not currently available,
+        /// or zero (0) if the end of the stream has been reached.</returns>
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            return this.source.Read(buffer, offset, count);
+        }
+
+        /// <summary>
+        /// Writes to the source stream.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. This method copies count
+        /// bytes from buffer to the stream.</param>
+        /// <param name="offset">The zero-based byte offset in buffer at which
+        /// to begin copying bytes to the stream.</param>
+        /// <param name="count">The number of bytes to be written to the stream.</param>
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            this.source.Write(buffer, offset, count);
+        }
+
+        /// <summary>
+        /// Changes the position of the source stream.
+        /// </summary>
+        /// <param name="offset">A byte offset relative to the origin parameter.</param>
+        /// <param name="origin">A value of type SeekOrigin indicating the reference
+        /// point used to obtain the new position.</param>
+        /// <returns>The new position within the stream.</returns>
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            return this.source.Seek(offset, origin);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/Compression.cd b/src/dtf/WixToolset.Dtf.Compression/Compression.cd
new file mode 100644
index 00000000..95012be0
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/Compression.cd
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+  <Comment CommentText="File-based classes">
+    <Position X="2.35" Y="1.442" Height="0.408" Width="0.783" />
+  </Comment>
+  <Comment CommentText="Stream-based classes">
+    <Position X="9.649" Y="1.317" Height="0.4" Width="0.996" />
+  </Comment>
+  <Class Name="WixToolset.Dtf.Compression.ArchiveException" Collapsed="true">
+    <Position X="3" Y="4.25" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>ArchiveException.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.Compression.ArchiveFileInfo">
+    <Position X="3" Y="0.5" Width="2" />
+    <Members>
+      <Method Name="ArchiveFileInfo" Hidden="true" />
+      <Field Name="archiveInfo" Hidden="true" />
+      <Field Name="archiveNumber" Hidden="true" />
+      <Field Name="attributes" Hidden="true" />
+      <Field Name="exists" Hidden="true" />
+      <Method Name="GetObjectData" Hidden="true" />
+      <Field Name="initialized" Hidden="true" />
+      <Field Name="lastWriteTime" Hidden="true" />
+      <Field Name="length" Hidden="true" />
+      <Field Name="name" Hidden="true" />
+      <Field Name="path" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AAAgAAAAIRJAAIMEAEACgARwAAEEEAAAASAAAAEAIAA=</HashCode>
+      <FileName>ArchiveFileInfo.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.Compression.ArchiveInfo">
+    <Position X="0.5" Y="0.5" Width="2.25" />
+    <Members>
+      <Method Name="ArchiveInfo" Hidden="true" />
+      <Method Name="CreateStringDictionary" Hidden="true" />
+      <Method Name="GetFile" Hidden="true" />
+      <Method Name="GetRelativeFilePathsInDirectoryTree" Hidden="true" />
+      <Method Name="InternalGetFiles" Hidden="true" />
+      <Method Name="RecursiveGetRelativeFilePathsInDirectoryTree" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AAEAABAAIAAAAgQEAAgBAARAHAEJACAAAABEAAkAMAI=</HashCode>
+      <FileName>ArchiveInfo.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.Compression.ArchiveFileStreamContext">
+    <Position X="12.75" Y="0.75" Width="2.25" />
+    <Members>
+      <Field Name="archiveFiles" Hidden="true" />
+      <Method Name="ArchiveFileStreamContext" Hidden="true" />
+      <Method Name="CloseArchiveReadStream" Hidden="true" />
+      <Method Name="CloseArchiveWriteStream" Hidden="true" />
+      <Method Name="CloseFileReadStream" Hidden="true" />
+      <Method Name="CloseFileWriteStream" Hidden="true" />
+      <Field Name="directory" Hidden="true" />
+      <Field Name="enableOffsetOpen" Hidden="true" />
+      <Field Name="extractOnlyNewerFiles" Hidden="true" />
+      <Field Name="files" Hidden="true" />
+      <Method Name="GetArchiveName" Hidden="true" />
+      <Method Name="GetOption" Hidden="true" />
+      <Method Name="OpenArchiveReadStream" Hidden="true" />
+      <Method Name="OpenArchiveWriteStream" Hidden="true" />
+      <Method Name="OpenFileReadStream" Hidden="true" />
+      <Method Name="OpenFileWriteStream" Hidden="true" />
+      <Method Name="TranslateFilePath" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AEQAABgAAACQAACACACAAgAQAAIgAAAAACAMgAAEAKA=</HashCode>
+      <FileName>ArchiveFileStreamContext.cs</FileName>
+    </TypeIdentifier>
+    <Lollipop Position="0.2" />
+  </Class>
+  <Class Name="WixToolset.Dtf.Compression.ArchiveProgressEventArgs">
+    <Position X="5.25" Y="0.5" Width="2.25" />
+    <Members>
+      <Method Name="ArchiveProgressEventArgs" Hidden="true" />
+      <Field Name="currentArchiveBytesProcessed" Hidden="true" />
+      <Field Name="currentArchiveName" Hidden="true" />
+      <Field Name="currentArchiveNumber" Hidden="true" />
+      <Field Name="currentArchiveTotalBytes" Hidden="true" />
+      <Field Name="currentFileBytesProcessed" Hidden="true" />
+      <Field Name="currentFileName" Hidden="true" />
+      <Field Name="currentFileNumber" Hidden="true" />
+      <Field Name="currentFileTotalBytes" Hidden="true" />
+      <Field Name="fileBytesProcessed" Hidden="true" />
+      <Field Name="progressType" Hidden="true" />
+      <Field Name="totalArchives" Hidden="true" />
+      <Field Name="totalFileBytes" Hidden="true" />
+      <Field Name="totalFiles" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AAMCAQASACAAABBBAAASUAAAQBAAAMAAAAGQAAgBEAA=</HashCode>
+      <FileName>ArchiveProgressEventArgs.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.Compression.BasicUnpackStreamContext">
+    <Position X="12.75" Y="3" Width="2.25" />
+    <Members>
+      <Field Name="archiveStream" Hidden="true" />
+      <Method Name="BasicUnpackStreamContext" Hidden="true" />
+      <Method Name="CloseArchiveReadStream" Hidden="true" />
+      <Method Name="CloseFileWriteStream" Hidden="true" />
+      <Field Name="fileStream" Hidden="true" />
+      <Method Name="OpenArchiveReadStream" Hidden="true" />
+      <Method Name="OpenFileWriteStream" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AAAAAAgAAACEAAAAAAAAAAAAAAAgAAAAIAAMAAAAAAA=</HashCode>
+      <FileName>BasicUnpackStreamContext.cs</FileName>
+    </TypeIdentifier>
+    <Lollipop Position="0.2" />
+  </Class>
+  <Class Name="WixToolset.Dtf.Compression.CompressionEngine">
+    <Position X="8" Y="0.5" Width="2.25" />
+    <Members>
+      <Method Name="~CompressionEngine" Hidden="true" />
+      <Method Name="CompressionEngine" Hidden="true" />
+      <Field Name="compressionLevel" Hidden="true" />
+      <Field Name="dontUseTempFiles" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AAAEAAAABCBAACRgAAAAAAQAAEAAAAAAQAEAAAiAAAI=</HashCode>
+      <FileName>CompressionEngine.cs</FileName>
+    </TypeIdentifier>
+    <Lollipop Position="0.2" />
+  </Class>
+  <Class Name="WixToolset.Dtf.Compression.DuplicateStream" Collapsed="true">
+    <Position X="10.5" Y="4.25" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAEAAAgAAQAIgGAAAIABgAAAAAAAAAAAAAAGIACA=</HashCode>
+      <FileName>DuplicateStream.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.Compression.OffsetStream" Collapsed="true">
+    <Position X="8" Y="4.25" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAgAAQAIgGAAAAABgAAAAAEAgAAAAAAGIwCA=</HashCode>
+      <FileName>OffsetStream.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Interface Name="WixToolset.Dtf.Compression.IPackStreamContext">
+    <Position X="10.5" Y="0.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAACAAACAAAAQAAAgAAAAACAIAAAAAAA=</HashCode>
+      <FileName>IPackStreamContext.cs</FileName>
+    </TypeIdentifier>
+  </Interface>
+  <Interface Name="WixToolset.Dtf.Compression.IUnpackStreamContext">
+    <Position X="10.5" Y="2.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAgAAACAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAA=</HashCode>
+      <FileName>IUnpackStreamContext.cs</FileName>
+    </TypeIdentifier>
+  </Interface>
+  <Enum Name="WixToolset.Dtf.Compression.ArchiveProgressType" Collapsed="true">
+    <Position X="5.25" Y="3.75" Width="2" />
+    <TypeIdentifier>
+      <HashCode>QAAAAAAAAAAAAIAAgAAAAAAAAAQAAAAACIAAAAAAAAA=</HashCode>
+      <FileName>ArchiveProgressType.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.Compression.CompressionLevel" Collapsed="true">
+    <Position X="5.25" Y="4.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAABAAAAAAEAAAAAAAAAAIAAAAAAAAAAEAAAA=</HashCode>
+      <FileName>CompressionLevel.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Font Name="Verdana" Size="8" />
+</ClassDiagram>
\ No newline at end of file
diff --git a/src/dtf/WixToolset.Dtf.Compression/CompressionEngine.cs b/src/dtf/WixToolset.Dtf.Compression/CompressionEngine.cs
new file mode 100644
index 00000000..7758ea98
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/CompressionEngine.cs
@@ -0,0 +1,371 @@
+// 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.Dtf.Compression
+{
+using System;
+using System.IO;
+using System.Collections.Generic;
+using System.Globalization;
+
+    /// <summary>
+    /// Base class for an engine capable of packing and unpacking a particular
+    /// compressed file format.
+    /// </summary>
+    public abstract class CompressionEngine : IDisposable
+    {
+        private CompressionLevel compressionLevel;
+        private bool dontUseTempFiles;
+
+        /// <summary>
+        /// Creates a new instance of the compression engine base class.
+        /// </summary>
+        protected CompressionEngine()
+        {
+            this.compressionLevel = CompressionLevel.Normal;
+        }
+
+        /// <summary>
+        /// Disposes the compression engine.
+        /// </summary>
+        ~CompressionEngine()
+        {
+            this.Dispose(false);
+        }
+
+        /// <summary>
+        /// Occurs when the compression engine reports progress in packing
+        /// or unpacking an archive.
+        /// </summary>
+        /// <seealso cref="ArchiveProgressType"/>
+        public event EventHandler<ArchiveProgressEventArgs> Progress;
+
+        /// <summary>
+        /// Gets or sets a flag indicating whether temporary files are created
+        /// and used during compression.
+        /// </summary>
+        /// <value>True if temporary files are used; false if compression is done
+        /// entirely in-memory.</value>
+        /// <remarks>The value of this property is true by default. Using temporary
+        /// files can greatly reduce the memory requirement of compression,
+        /// especially when compressing large archives. However, setting this property
+        /// to false may yield slightly better performance when creating small
+        /// archives. Or it may be necessary if the process does not have sufficient
+        /// privileges to create temporary files.</remarks>
+        public bool UseTempFiles
+        {
+            get
+            {
+                return !this.dontUseTempFiles;
+            }
+
+            set
+            {
+                this.dontUseTempFiles = !value;
+            }
+        }
+
+        /// <summary>
+        /// Compression level to use when compressing files.
+        /// </summary>
+        /// <value>A compression level ranging from minimum to maximum compression,
+        /// or no compression.</value>
+        public CompressionLevel CompressionLevel
+        {
+            get
+            {
+                return this.compressionLevel;
+            }
+
+            set
+            {
+                this.compressionLevel = value;
+            }
+        }
+
+        /// <summary>
+        /// Disposes of resources allocated by the compression engine.
+        /// </summary>
+        public void Dispose()
+        {
+            this.Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Creates an archive.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of archive and file streams.</param>
+        /// <param name="files">The paths of the files in the archive
+        /// (not external file paths).</param>
+        /// <exception cref="ArchiveException">The archive could not be
+        /// created.</exception>
+        /// <remarks>
+        /// The stream context implementation may provide a mapping from the
+        /// file paths within the archive to the external file paths.
+        /// </remarks>
+        public void Pack(IPackStreamContext streamContext, IEnumerable<string> files)
+        {
+            if (files == null)
+            {
+                throw new ArgumentNullException("files");
+            }
+
+            this.Pack(streamContext, files, 0);
+        }
+
+        /// <summary>
+        /// Creates an archive or chain of archives.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of archive and file streams.</param>
+        /// <param name="files">The paths of the files in the archive (not
+        /// external file paths).</param>
+        /// <param name="maxArchiveSize">The maximum number of bytes for one
+        /// archive before the contents are chained to the next archive, or zero
+        /// for unlimited archive size.</param>
+        /// <exception cref="ArchiveException">The archive could not be
+        /// created.</exception>
+        /// <remarks>
+        /// The stream context implementation may provide a mapping from the file
+        /// paths within the archive to the external file paths.
+        /// </remarks>
+        public abstract void Pack(
+            IPackStreamContext streamContext,
+            IEnumerable<string> files,
+            long maxArchiveSize);
+
+        /// <summary>
+        /// Checks whether a Stream begins with a header that indicates
+        /// it is a valid archive.
+        /// </summary>
+        /// <param name="stream">Stream for reading the archive file.</param>
+        /// <returns>True if the stream is a valid archive
+        /// (with no offset); false otherwise.</returns>
+        public abstract bool IsArchive(Stream stream);
+
+        /// <summary>
+        /// Gets the offset of an archive that is positioned 0 or more bytes
+        /// from the start of the Stream.
+        /// </summary>
+        /// <param name="stream">A stream for reading the archive.</param>
+        /// <returns>The offset in bytes of the archive,
+        /// or -1 if no archive is found in the Stream.</returns>
+        /// <remarks>The archive must begin on a 4-byte boundary.</remarks>
+        public virtual long FindArchiveOffset(Stream stream)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException("stream");
+            }
+
+            long sectionSize = 4;
+            long length = stream.Length;
+            for (long offset = 0; offset <= length - sectionSize; offset += sectionSize)
+            {
+                stream.Seek(offset, SeekOrigin.Begin);
+                if (this.IsArchive(stream))
+                {
+                    return offset;
+                }
+            }
+
+            return -1;
+        }
+
+        /// <summary>
+        /// Gets information about all files in an archive stream.
+        /// </summary>
+        /// <param name="stream">A stream for reading the archive.</param>
+        /// <returns>Information about all files in the archive stream.</returns>
+        /// <exception cref="ArchiveException">The stream is not a valid
+        /// archive.</exception>
+        public IList<ArchiveFileInfo> GetFileInfo(Stream stream)
+        {
+            return this.GetFileInfo(new BasicUnpackStreamContext(stream), null);
+        }
+
+        /// <summary>
+        /// Gets information about files in an archive or archive chain.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of archive and file streams.</param>
+        /// <param name="fileFilter">A predicate that can determine
+        /// which files to process, optional.</param>
+        /// <returns>Information about files in the archive stream.</returns>
+        /// <exception cref="ArchiveException">The archive provided
+        /// by the stream context is not valid.</exception>
+        /// <remarks>
+        /// The <paramref name="fileFilter"/> predicate takes an internal file
+        /// path and returns true to include the file or false to exclude it.
+        /// </remarks>
+        public abstract IList<ArchiveFileInfo> GetFileInfo(
+            IUnpackStreamContext streamContext,
+            Predicate<string> fileFilter);
+
+        /// <summary>
+        /// Gets the list of files in an archive Stream.
+        /// </summary>
+        /// <param name="stream">A stream for reading the archive.</param>
+        /// <returns>A list of the paths of all files contained in the
+        /// archive.</returns>
+        /// <exception cref="ArchiveException">The stream is not a valid
+        /// archive.</exception>
+        public IList<string> GetFiles(Stream stream)
+        {
+            return this.GetFiles(new BasicUnpackStreamContext(stream), null);
+        }
+
+        /// <summary>
+        /// Gets the list of files in an archive or archive chain.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of archive and file streams.</param>
+        /// <param name="fileFilter">A predicate that can determine
+        /// which files to process, optional.</param>
+        /// <returns>An array containing the names of all files contained in
+        /// the archive or archive chain.</returns>
+        /// <exception cref="ArchiveException">The archive provided
+        /// by the stream context is not valid.</exception>
+        /// <remarks>
+        /// The <paramref name="fileFilter"/> predicate takes an internal file
+        /// path and returns true to include the file or false to exclude it.
+        /// </remarks>
+        public IList<string> GetFiles(
+            IUnpackStreamContext streamContext,
+            Predicate<string> fileFilter)
+        {
+            if (streamContext == null)
+            {
+                throw new ArgumentNullException("streamContext");
+            }
+
+            IList<ArchiveFileInfo> files =
+                this.GetFileInfo(streamContext, fileFilter);
+            IList<string> fileNames = new List<string>(files.Count);
+            for (int i = 0; i < files.Count; i++)
+            {
+                fileNames.Add(files[i].Name);
+            }
+
+            return fileNames;
+        }
+
+        /// <summary>
+        /// Reads a single file from an archive stream.
+        /// </summary>
+        /// <param name="stream">A stream for reading the archive.</param>
+        /// <param name="path">The path of the file within the archive
+        /// (not the external file path).</param>
+        /// <returns>A stream for reading the extracted file, or null
+        /// if the file does not exist in the archive.</returns>
+        /// <exception cref="ArchiveException">The stream is not a valid
+        /// archive.</exception>
+        /// <remarks>The entire extracted file is cached in memory, so this
+        /// method requires enough free memory to hold the file.</remarks>
+        public Stream Unpack(Stream stream, string path)
+        {
+            if (stream == null)
+            {
+                throw new ArgumentNullException("stream");
+            }
+
+            if (path == null)
+            {
+                throw new ArgumentNullException("path");
+            }
+
+            BasicUnpackStreamContext streamContext =
+                new BasicUnpackStreamContext(stream);
+            this.Unpack(
+                streamContext,
+                delegate(string match)
+                {
+                    return String.Compare(
+                        match, path, true, CultureInfo.InvariantCulture) == 0;
+                });
+            
+            Stream extractStream = streamContext.FileStream;
+            if (extractStream != null)
+            {
+                extractStream.Position = 0;
+            }
+
+            return extractStream;
+        }
+
+        /// <summary>
+        /// Extracts files from an archive or archive chain.
+        /// </summary>
+        /// <param name="streamContext">A context interface to handle opening
+        /// and closing of archive and file streams.</param>
+        /// <param name="fileFilter">An optional predicate that can determine
+        /// which files to process.</param>
+        /// <exception cref="ArchiveException">The archive provided
+        /// by the stream context is not valid.</exception>
+        /// <remarks>
+        /// The <paramref name="fileFilter"/> predicate takes an internal file
+        /// path and returns true to include the file or false to exclude it.
+        /// </remarks>
+        public abstract void Unpack(
+            IUnpackStreamContext streamContext,
+            Predicate<string> fileFilter);
+
+        /// <summary>
+        /// Called by sublcasses to distribute a packing or unpacking progress
+        /// event to listeners.
+        /// </summary>
+        /// <param name="e">Event details.</param>
+        protected void OnProgress(ArchiveProgressEventArgs e)
+        {
+            if (this.Progress != null)
+            {
+                this.Progress(this, e);
+            }
+        }
+
+        /// <summary>
+        /// Disposes of resources allocated by the compression engine.
+        /// </summary>
+        /// <param name="disposing">If true, the method has been called
+        /// directly or indirectly by a user's code, so managed and unmanaged
+        /// resources will be disposed. If false, the method has been called by
+        /// the runtime from inside the finalizer, and only unmanaged resources
+        /// will be disposed.</param>
+        protected virtual void Dispose(bool disposing)
+        {
+        }
+
+        /// <summary>
+        /// Compresion utility function for converting old-style
+        /// date and time values to a DateTime structure.
+        /// </summary>
+        public static void DosDateAndTimeToDateTime(
+            short dosDate, short dosTime, out DateTime dateTime)
+        {
+            if (dosDate == 0 && dosTime == 0)
+            {
+                dateTime = DateTime.MinValue;
+            }
+            else
+            {
+                long fileTime;
+                SafeNativeMethods.DosDateTimeToFileTime(dosDate, dosTime, out fileTime);
+                dateTime = DateTime.FromFileTimeUtc(fileTime);
+                dateTime = new DateTime(dateTime.Ticks, DateTimeKind.Local);
+            }
+        }
+
+        /// <summary>
+        /// Compresion utility function for converting a DateTime structure
+        /// to old-style date and time values.
+        /// </summary>
+        public static void DateTimeToDosDateAndTime(
+            DateTime dateTime, out short dosDate, out short dosTime)
+        {
+            dateTime = new DateTime(dateTime.Ticks, DateTimeKind.Utc);
+            long filetime = dateTime.ToFileTimeUtc();
+            SafeNativeMethods.FileTimeToDosDateTime(ref filetime, out dosDate, out dosTime);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/CompressionLevel.cs b/src/dtf/WixToolset.Dtf.Compression/CompressionLevel.cs
new file mode 100644
index 00000000..84ec8fc4
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/CompressionLevel.cs
@@ -0,0 +1,31 @@
+// 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.Dtf.Compression
+{
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+    /// <summary>
+    /// Specifies the compression level ranging from minimum compresion to
+    /// maximum compression, or no compression at all.
+    /// </summary>
+    /// <remarks>
+    /// Although only four values are enumerated, any integral value between
+    /// <see cref="CompressionLevel.Min"/> and <see cref="CompressionLevel.Max"/> can also be used.
+    /// </remarks>
+    public enum CompressionLevel
+    {
+        /// <summary>Do not compress files, only store.</summary>
+        None = 0,
+
+        /// <summary>Minimum compression; fastest.</summary>
+        Min = 1,
+
+        /// <summary>A compromize between speed and compression efficiency.</summary>
+        Normal = 6,
+
+        /// <summary>Maximum compression; slowest.</summary>
+        Max = 10
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/DuplicateStream.cs b/src/dtf/WixToolset.Dtf.Compression/DuplicateStream.cs
new file mode 100644
index 00000000..50e62e73
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/DuplicateStream.cs
@@ -0,0 +1,212 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.IO;
+
+    /// <summary>
+    /// Duplicates a source stream by maintaining a separate position.
+    /// </summary>
+    /// <remarks>
+    /// WARNING: duplicate streams are not thread-safe with respect to each other or the original stream.
+    /// If multiple threads use duplicate copies of the same stream, they must synchronize for any operations.
+    /// </remarks>
+    public class DuplicateStream : Stream
+    {
+        private Stream source;
+        private long position;
+
+        /// <summary>
+        /// Creates a new duplicate of a stream.
+        /// </summary>
+        /// <param name="source">source of the duplicate</param>
+        public DuplicateStream(Stream source)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException("source");
+            }
+
+            this.source = DuplicateStream.OriginalStream(source);
+        }
+
+        /// <summary>
+        /// Gets the original stream that was used to create the duplicate.
+        /// </summary>
+        public Stream Source
+        {
+            get
+            {
+                return this.source;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports reading.
+        /// </summary>
+        /// <value>true if the stream supports reading; otherwise, false.</value>
+        public override bool CanRead
+        {
+            get
+            {
+                return this.source.CanRead;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports writing.
+        /// </summary>
+        /// <value>true if the stream supports writing; otherwise, false.</value>
+        public override bool CanWrite
+        {
+            get
+            {
+                return this.source.CanWrite;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports seeking.
+        /// </summary>
+        /// <value>true if the stream supports seeking; otherwise, false.</value>
+        public override bool CanSeek
+        {
+            get
+            {
+                return this.source.CanSeek;
+            }
+        }
+
+        /// <summary>
+        /// Gets the length of the source stream.
+        /// </summary>
+        public override long Length
+        {
+            get
+            {
+                return this.source.Length;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the position of the current stream,
+        /// ignoring the position of the source stream.
+        /// </summary>
+        public override long Position
+        {
+            get
+            {
+                return this.position;
+            }
+
+            set
+            {
+                this.position = value;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the original stream from a possible duplicate stream.
+        /// </summary>
+        /// <param name="stream">Possible duplicate stream.</param>
+        /// <returns>If the stream is a DuplicateStream, returns
+        /// the duplicate's source; otherwise returns the same stream.</returns>
+        public static Stream OriginalStream(Stream stream)
+        {
+            DuplicateStream dupStream = stream as DuplicateStream;
+            return dupStream != null ? dupStream.Source : stream;
+        }
+
+        /// <summary>
+        /// Flushes the source stream.
+        /// </summary>
+        public override void Flush()
+        {
+            this.source.Flush();
+        }
+
+        /// <summary>
+        /// Sets the length of the source stream.
+        /// </summary>
+        /// <param name="value">The desired length of the stream in bytes.</param>
+        public override void SetLength(long value)
+        { 
+            this.source.SetLength(value);
+        }
+
+        /// <summary>
+        /// Closes the underlying stream, effectively closing ALL duplicates.
+        /// </summary>
+        public override void Close()
+        {
+            this.source.Close();
+        }
+
+        /// <summary>
+        /// Reads from the source stream while maintaining a separate position
+        /// and not impacting the source stream's position.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. When this method returns, the buffer
+        /// contains the specified byte array with the values between offset and
+        /// (offset + count - 1) replaced by the bytes read from the current source.</param>
+        /// <param name="offset">The zero-based byte offset in buffer at which to begin
+        /// storing the data read from the current stream.</param>
+        /// <param name="count">The maximum number of bytes to be read from the current stream.</param>
+        /// <returns>The total number of bytes read into the buffer. This can be less
+        /// than the number of bytes requested if that many bytes are not currently available,
+        /// or zero (0) if the end of the stream has been reached.</returns>
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            long saveSourcePosition = this.source.Position;
+            this.source.Position = this.position;
+            int read = this.source.Read(buffer, offset, count);
+            this.position = this.source.Position;
+            this.source.Position = saveSourcePosition;
+            return read;
+        }
+
+        /// <summary>
+        /// Writes to the source stream while maintaining a separate position
+        /// and not impacting the source stream's position.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. This method copies count
+        /// bytes from buffer to the current stream.</param>
+        /// <param name="offset">The zero-based byte offset in buffer at which
+        /// to begin copying bytes to the current stream.</param>
+        /// <param name="count">The number of bytes to be written to the
+        /// current stream.</param>
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            long saveSourcePosition = this.source.Position;
+            this.source.Position = this.position;
+            this.source.Write(buffer, offset, count);
+            this.position = this.source.Position;
+            this.source.Position = saveSourcePosition;
+        }
+
+        /// <summary>
+        /// Changes the position of this stream without impacting the
+        /// source stream's position.
+        /// </summary>
+        /// <param name="offset">A byte offset relative to the origin parameter.</param>
+        /// <param name="origin">A value of type SeekOrigin indicating the reference
+        /// point used to obtain the new position.</param>
+        /// <returns>The new position within the current stream.</returns>
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            long originPosition = 0;
+            if (origin == SeekOrigin.Current)
+            {
+                originPosition = this.position;
+            }
+            else if (origin == SeekOrigin.End)
+            {
+                originPosition = this.Length;
+            }
+
+            this.position = originPosition + offset;
+            return this.position;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/IPackStreamContext.cs b/src/dtf/WixToolset.Dtf.Compression/IPackStreamContext.cs
new file mode 100644
index 00000000..19d77be5
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/IPackStreamContext.cs
@@ -0,0 +1,117 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.IO;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// This interface provides the methods necessary for the
+    /// <see cref="CompressionEngine"/> to open and close streams for archives
+    /// and files. The implementor of this interface can use any kind of logic
+    /// to determine what kind of streams to open and where.
+    /// </summary>
+    public interface IPackStreamContext
+    {
+        /// <summary>
+        /// Gets the name of the archive with a specified number.
+        /// </summary>
+        /// <param name="archiveNumber">The 0-based index of the archive
+        /// within the chain.</param>
+        /// <returns>The name of the requested archive. May be an empty string
+        /// for non-chained archives, but may never be null.</returns>
+        /// <remarks>The archive name is the name stored within the archive, used for
+        /// identification of the archive especially among archive chains. That
+        /// name is often, but not necessarily the same as the filename of the
+        /// archive package.</remarks>
+        string GetArchiveName(int archiveNumber);
+
+        /// <summary>
+        /// Opens a stream for writing an archive package.
+        /// </summary>
+        /// <param name="archiveNumber">The 0-based index of the archive within
+        /// the chain.</param>
+        /// <param name="archiveName">The name of the archive that was returned
+        /// by <see cref="GetArchiveName"/>.</param>
+        /// <param name="truncate">True if the stream should be truncated when
+        /// opened (if it already exists); false if an existing stream is being
+        /// re-opened for writing additional data.</param>
+        /// <param name="compressionEngine">Instance of the compression engine
+        /// doing the operations.</param>
+        /// <returns>A writable Stream where the compressed archive bytes will be
+        /// written, or null to cancel the archive creation.</returns>
+        /// <remarks>
+        /// If this method returns null, the archive engine will throw a
+        /// FileNotFoundException.
+        /// </remarks>
+        Stream OpenArchiveWriteStream(
+            int archiveNumber,
+            string archiveName,
+            bool truncate,
+            CompressionEngine compressionEngine);
+
+        /// <summary>
+        /// Closes a stream where an archive package was written.
+        /// </summary>
+        /// <param name="archiveNumber">The 0-based index of the archive within
+        /// the chain.</param>
+        /// <param name="archiveName">The name of the archive that was previously
+        /// returned by
+        /// <see cref="GetArchiveName"/>.</param>
+        /// <param name="stream">A stream that was previously returned by
+        /// <see cref="OpenArchiveWriteStream"/> and is now ready to be closed.</param>
+        /// <remarks>
+        /// If there is another archive package in the chain, then after this stream
+        /// is closed a new stream will be opened.
+        /// </remarks>
+        void CloseArchiveWriteStream(int archiveNumber, string archiveName, Stream stream);
+
+        /// <summary>
+        /// Opens a stream to read a file that is to be included in an archive.
+        /// </summary>
+        /// <param name="path">The path of the file within the archive. This is often,
+        /// but not necessarily, the same as the relative path of the file outside
+        /// the archive.</param>
+        /// <param name="attributes">Returned attributes of the opened file, to be
+        /// stored in the archive.</param>
+        /// <param name="lastWriteTime">Returned last-modified time of the opened file,
+        /// to be stored in the archive.</param>
+        /// <returns>A readable Stream where the file bytes will be read from before
+        /// they are compressed, or null to skip inclusion of the file and continue to
+        /// the next file.</returns>
+        [SuppressMessage("Microsoft.Design", "CA1021:AvoidOutParameters")]
+        Stream OpenFileReadStream(
+            string path,
+            out FileAttributes attributes,
+            out DateTime lastWriteTime);
+
+        /// <summary>
+        /// Closes a stream that has been used to read a file.
+        /// </summary>
+        /// <param name="path">The path of the file within the archive; the same as
+        /// the path provided
+        /// when the stream was opened.</param>
+        /// <param name="stream">A stream that was previously returned by
+        /// <see cref="OpenFileReadStream"/> and is now ready to be closed.</param>
+        void CloseFileReadStream(string path, Stream stream);
+
+        /// <summary>
+        /// Gets extended parameter information specific to the compression
+        /// format being used.
+        /// </summary>
+        /// <param name="optionName">Name of the option being requested.</param>
+        /// <param name="parameters">Parameters for the option; for per-file options,
+        /// the first parameter is typically the internal file path.</param>
+        /// <returns>Option value, or null to use the default behavior.</returns>
+        /// <remarks>
+        /// This method provides a way to set uncommon options during packaging, or a
+        /// way to handle aspects of compression formats not supported by the base library.
+        /// <para>For example, this may be used by the zip compression library to
+        /// specify different compression methods/levels on a per-file basis.</para>
+        /// <para>The available option names, parameters, and expected return values
+        /// should be documented by each compression library.</para>
+        /// </remarks>
+        object GetOption(string optionName, object[] parameters);
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/IUnpackStreamContext.cs b/src/dtf/WixToolset.Dtf.Compression/IUnpackStreamContext.cs
new file mode 100644
index 00000000..f0bc6aad
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/IUnpackStreamContext.cs
@@ -0,0 +1,71 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.IO;
+
+    /// <summary>
+    /// This interface provides the methods necessary for the <see cref="CompressionEngine"/> to open
+    /// and close streams for archives and files. The implementor of this interface can use any
+    /// kind of logic to determine what kind of streams to open and where 
+    /// </summary>
+    public interface IUnpackStreamContext
+    {
+        /// <summary>
+        /// Opens the archive stream for reading.
+        /// </summary>
+        /// <param name="archiveNumber">The zero-based index of the archive to open.</param>
+        /// <param name="archiveName">The name of the archive being opened.</param>
+        /// <param name="compressionEngine">Instance of the compression engine doing the operations.</param>
+        /// <returns>A stream from which archive bytes are read, or null to cancel extraction
+        /// of the archive.</returns>
+        /// <remarks>
+        /// When the first archive in a chain is opened, the name is not yet known, so the
+        /// provided value will be an empty string. When opening further archives, the
+        /// provided value is the next-archive name stored in the previous archive. This
+        /// name is often, but not necessarily, the same as the filename of the archive
+        /// package to be opened.
+        /// <para>If this method returns null, the archive engine will throw a
+        /// FileNotFoundException.</para>
+        /// </remarks>
+        Stream OpenArchiveReadStream(int archiveNumber, string archiveName, CompressionEngine compressionEngine);
+
+        /// <summary>
+        /// Closes a stream where an archive package was read.
+        /// </summary>
+        /// <param name="archiveNumber">The archive number of the stream to close.</param>
+        /// <param name="archiveName">The name of the archive being closed.</param>
+        /// <param name="stream">The stream that was previously returned by
+        /// <see cref="OpenArchiveReadStream"/> and is now ready to be closed.</param>
+        void CloseArchiveReadStream(int archiveNumber, string archiveName, Stream stream);
+
+        /// <summary>
+        /// Opens a stream for writing extracted file bytes.
+        /// </summary>
+        /// <param name="path">The path of the file within the archive. This is often, but
+        /// not necessarily, the same as the relative path of the file outside the archive.</param>
+        /// <param name="fileSize">The uncompressed size of the file to be extracted.</param>
+        /// <param name="lastWriteTime">The last write time of the file to be extracted.</param>
+        /// <returns>A stream where extracted file bytes are to be written, or null to skip
+        /// extraction of the file and continue to the next file.</returns>
+        /// <remarks>
+        /// The implementor may use the path, size and date information to dynamically
+        /// decide whether or not the file should be extracted.
+        /// </remarks>
+        Stream OpenFileWriteStream(string path, long fileSize, DateTime lastWriteTime);
+
+        /// <summary>
+        /// Closes a stream where an extracted file was written.
+        /// </summary>
+        /// <param name="path">The path of the file within the archive.</param>
+        /// <param name="stream">The stream that was previously returned by <see cref="OpenFileWriteStream"/>
+        /// and is now ready to be closed.</param>
+        /// <param name="attributes">The attributes of the extracted file.</param>
+        /// <param name="lastWriteTime">The last write time of the file.</param>
+        /// <remarks>
+        /// The implementor may wish to apply the attributes and date to the newly-extracted file.
+        /// </remarks>
+        void CloseFileWriteStream(string path, Stream stream, FileAttributes attributes, DateTime lastWriteTime);
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/OffsetStream.cs b/src/dtf/WixToolset.Dtf.Compression/OffsetStream.cs
new file mode 100644
index 00000000..65562524
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/OffsetStream.cs
@@ -0,0 +1,206 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.IO;
+
+    /// <summary>
+    /// Wraps a source stream and offsets all read/write/seek calls by a given value.
+    /// </summary>
+    /// <remarks>
+    /// This class is used to trick archive an packing or unpacking process
+    /// into reading or writing at an offset into a file, primarily for
+    /// self-extracting packages.
+    /// </remarks>
+    public class OffsetStream : Stream
+    {
+        private Stream source;
+        private long sourceOffset;
+
+        /// <summary>
+        /// Creates a new OffsetStream instance from a source stream
+        /// and using a specified offset.
+        /// </summary>
+        /// <param name="source">Underlying stream for which all calls will be offset.</param>
+        /// <param name="offset">Positive or negative number of bytes to offset.</param>
+        public OffsetStream(Stream source, long offset)
+        {
+            if (source == null)
+            {
+                throw new ArgumentNullException("source");
+            }
+
+            this.source = source;
+            this.sourceOffset = offset;
+
+            this.source.Seek(this.sourceOffset, SeekOrigin.Current);
+        }
+
+        /// <summary>
+        /// Gets the underlying stream that this OffsetStream calls into.
+        /// </summary>
+        public Stream Source
+        {
+            get { return this.source; }
+        }
+
+        /// <summary>
+        /// Gets the number of bytes to offset all calls before
+        /// redirecting to the underlying stream.
+        /// </summary>
+        public long Offset
+        {
+            get { return this.sourceOffset; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports reading.
+        /// </summary>
+        /// <value>true if the stream supports reading; otherwise, false.</value>
+        public override bool CanRead
+        {
+            get
+            {
+                return this.source.CanRead;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports writing.
+        /// </summary>
+        /// <value>true if the stream supports writing; otherwise, false.</value>
+        public override bool CanWrite
+        {
+            get
+            {
+                return this.source.CanWrite;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the source stream supports seeking.
+        /// </summary>
+        /// <value>true if the stream supports seeking; otherwise, false.</value>
+        public override bool CanSeek
+        {
+            get
+            {
+                return this.source.CanSeek;
+            }
+        }
+
+        /// <summary>
+        /// Gets the effective length of the stream, which is equal to
+        /// the length of the source stream minus the offset.
+        /// </summary>
+        public override long Length
+        {
+            get { return this.source.Length - this.sourceOffset; } 
+        }
+
+        /// <summary>
+        /// Gets or sets the effective position of the stream, which
+        /// is equal to the position of the source stream minus the offset.
+        /// </summary>
+        public override long Position
+        {
+            get { return this.source.Position - this.sourceOffset; }
+            set { this.source.Position = value + this.sourceOffset; }
+        }
+
+        /// <summary>
+        /// Reads a sequence of bytes from the source stream and advances
+        /// the position within the stream by the number of bytes read.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. When this method returns, the buffer
+        /// contains the specified byte array with the values between offset and
+        /// (offset + count - 1) replaced by the bytes read from the current source.</param>
+        /// <param name="offset">The zero-based byte offset in buffer at which to begin
+        /// storing the data read from the current stream.</param>
+        /// <param name="count">The maximum number of bytes to be read from the current stream.</param>
+        /// <returns>The total number of bytes read into the buffer. This can be less
+        /// than the number of bytes requested if that many bytes are not currently available,
+        /// or zero (0) if the end of the stream has been reached.</returns>
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            return this.source.Read(buffer, offset, count);
+        }
+
+        /// <summary>
+        /// Writes a sequence of bytes to the source stream and advances the
+        /// current position within this stream by the number of bytes written.
+        /// </summary>
+        /// <param name="buffer">An array of bytes. This method copies count
+        /// bytes from buffer to the current stream.</param>
+        /// <param name="offset">The zero-based byte offset in buffer at which
+        /// to begin copying bytes to the current stream.</param>
+        /// <param name="count">The number of bytes to be written to the
+        /// current stream.</param>
+        public override void Write(byte[] buffer, int offset, int count)
+        {
+            this.source.Write(buffer, offset, count);
+        }
+
+        /// <summary>
+        /// Reads a byte from the stream and advances the position within the
+        /// source stream by one byte, or returns -1 if at the end of the stream.
+        /// </summary>
+        /// <returns>The unsigned byte cast to an Int32, or -1 if at the
+        /// end of the stream.</returns>
+        public override int ReadByte()
+        {
+            return this.source.ReadByte();
+        }
+
+        /// <summary>
+        /// Writes a byte to the current position in the source stream and
+        /// advances the position within the stream by one byte.
+        /// </summary>
+        /// <param name="value">The byte to write to the stream.</param>
+        public override void WriteByte(byte value)
+        {
+            this.source.WriteByte(value);
+        }
+
+        /// <summary>
+        /// Flushes the source stream.
+        /// </summary>
+        public override void Flush()
+        {
+            this.source.Flush();
+        }
+
+        /// <summary>
+        /// Sets the position within the current stream, which is
+        /// equal to the position within the source stream minus the offset.
+        /// </summary>
+        /// <param name="offset">A byte offset relative to the origin parameter.</param>
+        /// <param name="origin">A value of type SeekOrigin indicating
+        /// the reference point used to obtain the new position.</param>
+        /// <returns>The new position within the current stream.</returns>
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            return this.source.Seek(offset + (origin == SeekOrigin.Begin ? this.sourceOffset : 0), origin) - this.sourceOffset;
+        }
+
+        /// <summary>
+        /// Sets the effective length of the stream, which is equal to
+        /// the length of the source stream minus the offset.
+        /// </summary>
+        /// <param name="value">The desired length of the
+        /// current stream in bytes.</param>
+        public override void SetLength(long value)
+        {
+            this.source.SetLength(value + this.sourceOffset);
+        }
+
+        /// <summary>
+        /// Closes the underlying stream.
+        /// </summary>
+        public override void Close()
+        {
+            this.source.Close();
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/SafeNativeMethods.cs b/src/dtf/WixToolset.Dtf.Compression/SafeNativeMethods.cs
new file mode 100644
index 00000000..1829ba81
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/SafeNativeMethods.cs
@@ -0,0 +1,22 @@
+// 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.Dtf.Compression
+{
+    using System;
+    using System.Security;
+    using System.Runtime.InteropServices;
+
+    [SuppressUnmanagedCodeSecurity]
+    internal static class SafeNativeMethods
+    {
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool DosDateTimeToFileTime(
+            short wFatDate, short wFatTime, out long fileTime);
+
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool FileTimeToDosDateTime(
+            ref long fileTime, out short wFatDate, out short wFatTime);
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
new file mode 100644
index 00000000..e49a446b
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Compression/WixToolset.Dtf.Compression.csproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>WixToolset.Dtf.Compression</RootNamespace>
+    <AssemblyName>WixToolset.Dtf.Compression</AssemblyName>
+    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <Description>Abstract base libraries for archive packing and unpacking</Description>
+    <CreateDocumentationFile>true</CreateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="Compression.cd" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj b/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj
new file mode 100644
index 00000000..b1b3faa7
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.csproj
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <Description>WiX Toolset Dtf MSBuild integration</Description>
+    <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
+    <NuspecBasePath>$(OutputPath)publish\WixToolset.Dtf.MSBuild\</NuspecBasePath>
+    <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description)</NuspecProperties>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="build\WixToolset.Dtf.MSBuild.props" />
+    <None Remove="tools\wix.ca.targets" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="build\WixToolset.Dtf.MSBuild.props">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="tools\wix.ca.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <GenerateNuspecDependsOn>$(GenerateNuspecDependsOn);SetNuspecVersion</GenerateNuspecDependsOn>
+  </PropertyGroup>
+
+  <Target Name="SetNuspecVersion">
+    <Error Text="Cannot pack $(MSBuildThisFileName) until all projects are published to: '$(NuspecBasePath)'. Run appveyor.cmd to publish projects properly." Condition=" !Exists('$(NuspecBasePath)') " />
+
+    <PropertyGroup>
+      <NuspecProperties>$(NuspecProperties);Version=$(Version);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.nuspec b/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.nuspec
new file mode 100644
index 00000000..7f819cdb
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.MSBuild/WixToolset.Dtf.MSBuild.nuspec
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>$id$</id>
+    <version>$version$</version>
+    <authors>$authors$</authors>
+    <owners>$authors$</owners>
+        <license type="expression">MS-RL</license>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>$description$</description>
+    <copyright>$copyright$</copyright>
+  </metadata>
+
+  <files>
+    <file src="build\**\*" target="build" />
+    <file src="tools\**\*" target="tools" />
+  </files>
+</package>
diff --git a/src/dtf/WixToolset.Dtf.MSBuild/build/WixToolset.Dtf.MSBuild.props b/src/dtf/WixToolset.Dtf.MSBuild/build/WixToolset.Dtf.MSBuild.props
new file mode 100644
index 00000000..06a98d6e
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.MSBuild/build/WixToolset.Dtf.MSBuild.props
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <WixCATargetsPath Condition=" '$(WixCATargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\wix.ca.targets'))</WixCATargetsPath>
+  </PropertyGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.MSBuild/tools/wix.ca.targets b/src/dtf/WixToolset.Dtf.MSBuild/tools/wix.ca.targets
new file mode 100644
index 00000000..4578c2d8
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.MSBuild/tools/wix.ca.targets
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- 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. -->
+
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+
+  <Import Project="$(CustomBeforeWixCATargets)" Condition=" '$(CustomBeforeWixCATargets)' != '' and Exists('$(CustomBeforeWixCATargets)')" />
+
+  <PropertyGroup>
+    <WixCATargetsImported>true</WixCATargetsImported>
+
+    <TargetCAFileName Condition=" '$(TargetCAFileName)' == '' ">$(TargetName).CA$(TargetExt)</TargetCAFileName>
+
+    <WixSdkPath Condition=" '$(WixSdkPath)' == '' ">$(MSBuildThisFileDirectory)</WixSdkPath>
+    <WixSdkX86Path Condition=" '$(WixSdkX86Path)' == '' ">$(WixSdkPath)x86\</WixSdkX86Path>
+    <WixSdkX64Path Condition=" '$(WixSdkX64Path)' == '' ">$(WixSdkPath)x64\</WixSdkX64Path>
+
+    <MakeSfxCA Condition=" '$(MakeSfxCA)' == '' ">$(WixSdkPath)MakeSfxCA.exe</MakeSfxCA>
+    <SfxCADll Condition=" '$(SfxCADll)' == '' and '$(Platform)' == 'x64' ">$(WixSdkX64Path)SfxCA.dll</SfxCADll>
+    <SfxCADll Condition=" '$(SfxCADll)' == '' ">$(WixSdkX86Path)SfxCA.dll</SfxCADll>
+  </PropertyGroup>
+
+  <!--
+  ==================================================================================================
+  PackCustomAction
+
+    Creates an MSI managed custom action package that includes the custom action assembly,
+    local assembly dependencies, and project content files.
+
+    [IN]
+    @(IntermediateAssembly) - Managed custom action assembly.
+    @(Content) - Project items of type Content will be included in the package.
+    $(CustomActionContents) - Optional space-delimited list of additional files to include.
+    
+    [OUT]
+    $(IntermediateOutputPath)$(TargetCAFileName) - Managed custom action package with unmanaged stub.
+  ==================================================================================================
+  -->
+  <Target Name="PackCustomAction"
+          Inputs="@(IntermediateAssembly);@(Content);$(CustomActionContents)"
+          Outputs="$(IntermediateOutputPath)$(TargetCAFileName)">
+
+    <!-- Find all referenced items marked CopyLocal, but exclude non-binary files. -->
+    <ItemGroup>
+      <CustomActionReferenceContents Include="@(ReferenceCopyLocalPaths)"
+                                     Condition=" '%(Extension)' == '.dll' or '%(Extension)' == '.exe' " />
+      <CustomActionReferenceContents Include="@(ReferenceComWrappersToCopyLocal)"
+                                     Condition=" '%(Extension)' == '.dll' or '%(Extension)' == '.exe' " />
+    
+      <!-- include PDBs for Debug only -->
+      <CustomActionReferenceContents Include="@(IntermediateAssembly->'%(RootDir)%(Directory)%(Filename).pdb')"
+                                     Condition=" Exists('%(RootDir)%(Directory)%(Filename).pdb') and '$(Configuration)' == 'Debug' " />
+      <CustomActionReferenceContents Include="@(ReferenceCopyLocalPaths)"
+                                     Condition=" '%(Extension)' == '.pdb' and '$(Configuration)' == 'Debug' " />
+      <CustomActionReferenceContents Include="@(ReferenceComWrappersToCopyLocal)"
+                                     Condition=" '%(Extension)' == '.pdb' and '$(Configuration)' == 'Debug' " />
+    </ItemGroup>
+
+    <!--
+      Items to include in the CA package:
+         - Reference assemblies marked CopyLocal
+         - Project items of type Content
+         - Additional items in the CustomActionContents property
+    -->
+    <PropertyGroup>
+      <CustomActionContents>@(CustomActionReferenceContents);@(Content->'%(FullPath)');$(CustomActionContents)</CustomActionContents>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <IntermediateCAAssembly Include="@(IntermediateAssembly->'%(FullPath)')" />
+      <IntermediateCAPackage Include="@(IntermediateAssembly->'%(RootDir)%(Directory)$(TargetCAFileName)')" />
+    </ItemGroup>
+
+    <!-- Run the MakeSfxCA.exe CA packaging tool. -->
+    <Exec Command='"$(MakeSfxCA)" "@(IntermediateCAPackage)" "$(SfxCADll)" "@(IntermediateCAAssembly)" "$(CustomActionContents)"'
+          WorkingDirectory="$(ProjectDir)" />
+  
+    <!-- Add modules to be copied to output dir. -->
+    <ItemGroup>
+      <AddModules Include="@(IntermediateCAPackage)" />
+    </ItemGroup>
+  </Target>
+
+  <!--
+  ==================================================================================================
+  CleanCustomAction
+
+    Cleans the .CA.dll binary created by the PackCustomAction target.
+
+  ==================================================================================================
+  -->
+  <Target Name="CleanCustomAction">
+    <Delete Files="$(IntermediateOutputPath)$(TargetCAFileName)"
+            TreatErrorsAsWarnings="true" />
+  </Target>
+
+  <!--
+  ==================================================================================================
+  AfterCompile (redefinition)
+
+    Calls the PackCustomAction target after compiling.
+    Overrides the empty AfterCompile target from Microsoft.Common.targets.
+
+  ==================================================================================================
+  -->
+  <Target Name="AfterCompile"
+          DependsOnTargets="PackCustomAction" />
+
+  <!--
+  ==================================================================================================
+  BeforeClean (redefinition)
+
+    Calls the CleanCustomAction target before cleaning.
+    Overrides the empty AfterCompile target from Microsoft.Common.targets.
+
+  ==================================================================================================
+  -->
+  <Target Name="BeforeClean"
+          DependsOnTargets="CleanCustomAction" />
+
+  <Import Project="$(CustomAfterWixCATargets)" Condition=" '$(CustomAfterWixCATargets)' != '' and Exists('$(CustomAfterWixCATargets)')" />
+
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.Resources/AssemblyInfo.cs b/src/dtf/WixToolset.Dtf.Resources/AssemblyInfo.cs
new file mode 100644
index 00000000..77f33f97
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+// 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.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Scope = "member", Target = "WixToolset.Dtf.Resources.ResourceCollection.#System.Collections.Generic.ICollection`1<WixToolset.Dtf.Resources.Resource>.IsReadOnly")]
diff --git a/src/dtf/WixToolset.Dtf.Resources/BitmapResource.cs b/src/dtf/WixToolset.Dtf.Resources/BitmapResource.cs
new file mode 100644
index 00000000..42c886cb
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/BitmapResource.cs
@@ -0,0 +1,57 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.IO;
+
+    /// <summary>
+    /// A subclass of Resource which provides specific methods for manipulating the resource data.
+    /// </summary>
+    /// <remarks>
+    /// The resource is of type <see cref="ResourceType.Bitmap"/> (RT_GROUPICON).
+    /// </remarks>
+    public sealed class BitmapResource : Resource
+    {
+        private const int SizeOfBitmapFileHeader = 14; // this is the sizeof(BITMAPFILEHEADER)
+
+        /// <summary>
+        /// Creates a new BitmapResource object without any data. The data can be later loaded from a file.
+        /// </summary>
+        /// <param name="name">Name of the resource. For a numeric resource identifier, prefix the decimal number with a "#".</param>
+        /// <param name="locale">Locale of the resource</param>
+        public BitmapResource(string name, int locale)
+            : this(name, locale, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new BitmapResource object with data. The data can be later saved to a file.
+        /// </summary>
+        /// <param name="name">Name of the resource. For a numeric resource identifier, prefix the decimal number with a "#".</param>
+        /// <param name="locale">Locale of the resource</param>
+        /// <param name="data">Raw resource data</param>
+        public BitmapResource(string name, int locale, byte[] data)
+            : base(ResourceType.Bitmap, name, locale, data)
+        {
+        }
+
+        /// <summary>
+        /// Reads the bitmap from a .bmp file.
+        /// </summary>
+        /// <param name="path">Path to a bitmap file (.bmp).</param>
+        public void ReadFromFile(string path)
+        {
+            using (FileStream fs = new FileStream(path, FileMode.Open, FileAccess.Read))
+            {
+                // Move past the BITMAPFILEHEADER, and copy the rest of the bitmap as the resource data. Resource
+                // functions expect only the BITMAPINFO struct which exists just beyond the BITMAPFILEHEADER
+                // struct in bitmap files.
+                fs.Seek(BitmapResource.SizeOfBitmapFileHeader, SeekOrigin.Begin);
+
+                base.Data = new byte[fs.Length - BitmapResource.SizeOfBitmapFileHeader];
+                fs.Read(base.Data, 0, base.Data.Length);
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/FixedFileVersionInfo.cs b/src/dtf/WixToolset.Dtf.Resources/FixedFileVersionInfo.cs
new file mode 100644
index 00000000..e0d081db
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/FixedFileVersionInfo.cs
@@ -0,0 +1,183 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Reflection;
+    using System.Collections;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    internal class FixedFileVersionInfo
+    {
+        public FixedFileVersionInfo()
+        {
+            // Set reasonable defaults
+            this.signature = 0xFEEF04BD;
+            this.structVersion = 0x00010000; // v1.0
+            this.FileVersion = new Version(0, 0, 0, 0);
+            this.ProductVersion = new Version(0, 0, 0, 0);
+            this.FileFlagsMask = VersionBuildTypes.Debug | VersionBuildTypes.Prerelease;
+            this.FileFlags = VersionBuildTypes.None;
+            this.FileOS = VersionFileOS.NT_WINDOWS32;
+            this.FileType = VersionFileType.Application;
+            this.FileSubtype = VersionFileSubtype.Unknown;
+            this.Timestamp = DateTime.MinValue;
+        }
+
+        private uint signature;
+        private uint structVersion;
+
+        public Version FileVersion
+        {
+            get
+            {
+                return this.fileVersion;
+            }
+
+            set
+            {
+                if (value == null)
+                {
+                    throw new InvalidOperationException();
+                }
+
+                this.fileVersion = value;
+            }
+        }
+        private Version fileVersion;
+
+        public Version ProductVersion
+        {
+            get
+            {
+                return this.productVersion;
+            }
+
+            set
+            {
+                if (value == null)
+                {
+                    throw new InvalidOperationException();
+                }
+
+                this.productVersion = value;
+            }
+        }
+        private Version productVersion;
+
+        public VersionBuildTypes FileFlagsMask
+        {
+            get { return this.fileFlagsMask; }
+            set { this.fileFlagsMask = value; }
+        }
+        private VersionBuildTypes fileFlagsMask;
+
+        public VersionBuildTypes FileFlags
+        {
+            get { return this.fileFlags; }
+            set { this.fileFlags = value; }
+        }
+        private VersionBuildTypes fileFlags;
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public VersionFileOS FileOS
+        {
+            get { return this.fileOS; }
+            set { this.fileOS = value; }
+        }
+        private VersionFileOS fileOS;
+
+        public VersionFileType FileType
+        {
+            get { return this.fileType; }
+            set { this.fileType = value; }
+        }
+        private VersionFileType fileType;
+
+        public VersionFileSubtype FileSubtype
+        {
+            get { return this.fileSubtype; }
+            set { this.fileSubtype = value; }
+        }
+        private VersionFileSubtype fileSubtype;
+
+        public DateTime Timestamp
+        {
+            get { return this.timestamp; }
+            set { this.timestamp = value; }
+        }
+        private DateTime timestamp;
+
+        public void Read(BinaryReader reader)
+        {
+            this.signature = reader.ReadUInt32();
+            this.structVersion = reader.ReadUInt32();
+            this.fileVersion = UInt64ToVersion(reader.ReadUInt64());
+            this.productVersion = UInt64ToVersion(reader.ReadUInt64());
+            this.fileFlagsMask = (VersionBuildTypes) reader.ReadInt32();
+            this.fileFlags = (VersionBuildTypes) reader.ReadInt32();
+            this.fileOS = (VersionFileOS) reader.ReadInt32();
+            this.fileType = (VersionFileType) reader.ReadInt32();
+            this.fileSubtype = (VersionFileSubtype) reader.ReadInt32();
+            this.timestamp = UInt64ToDateTime(reader.ReadUInt64());
+        }
+
+        public void Write(BinaryWriter writer)
+        {
+            writer.Write(this.signature);
+            writer.Write(this.structVersion);
+            writer.Write(VersionToUInt64(this.fileVersion));
+            writer.Write(VersionToUInt64(this.productVersion));
+            writer.Write((int) this.fileFlagsMask);
+            writer.Write((int) this.fileFlags);
+            writer.Write((int) this.fileOS);
+            writer.Write((int) this.fileType);
+            writer.Write((int) this.fileSubtype);
+            writer.Write(DateTimeToUInt64(this.timestamp));
+        }
+
+        public static explicit operator FixedFileVersionInfo(byte[] bytesValue)
+        {
+            FixedFileVersionInfo ffviValue = new FixedFileVersionInfo();
+            using (BinaryReader reader = new BinaryReader(new MemoryStream(bytesValue, false)))
+            {
+                ffviValue.Read(reader);
+            }
+            return ffviValue;
+        }
+
+        public static explicit operator byte[](FixedFileVersionInfo ffviValue)
+        {
+            const int FFVI_LENGTH = 52;
+
+            byte[] bytesValue = new byte[FFVI_LENGTH];
+            using (BinaryWriter writer = new BinaryWriter(new MemoryStream(bytesValue, true)))
+            {
+                ffviValue.Write(writer);
+            }
+            return bytesValue;
+        }
+
+        private static Version UInt64ToVersion(ulong version)
+        {
+            return new Version((int) ((version >> 16) & 0xFFFF), (int) (version & 0xFFFF), (int) (version >> 48), (int) ((version >> 32) & 0xFFFF));
+        }
+        private static ulong VersionToUInt64(Version version)
+        {
+            return (((ulong) (ushort) version.Major) << 16) | ((ulong) (ushort) version.Minor)
+                | (((ulong) (ushort) version.Build) << 48) | (((ulong) (ushort) version.Revision) << 32);
+        }
+
+        private static DateTime UInt64ToDateTime(ulong dateTime)
+        {
+            return (dateTime == 0 ? DateTime.MinValue : DateTime.FromFileTime((long) dateTime));
+        }
+        private static ulong DateTimeToUInt64(DateTime dateTime)
+        {
+            return (dateTime == DateTime.MinValue ? 0 : (ulong) dateTime.ToFileTime());
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/GroupIconInfo.cs b/src/dtf/WixToolset.Dtf.Resources/GroupIconInfo.cs
new file mode 100644
index 00000000..0fb56223
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/GroupIconInfo.cs
@@ -0,0 +1,119 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Reflection;
+    using System.Collections;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    internal enum GroupIconType
+    {
+        Unknown,
+        Icon,
+        Cursor,
+    }
+
+    internal struct GroupIconDirectoryInfo
+    {
+        public byte width;
+        public byte height;
+        public byte colors;
+        public byte reserved;
+        public ushort planes;
+        public ushort bitsPerPixel;
+        public uint imageSize;
+        public uint imageOffset; // only valid when icon group is read from .ico file.
+        public ushort imageIndex; // only valid when icon group is read from PE resource.
+    }
+
+    internal class GroupIconInfo
+    {
+        private ushort reserved;
+        private GroupIconType type;
+        private GroupIconDirectoryInfo[] images;
+
+        public GroupIconInfo()
+        {
+            this.images = new GroupIconDirectoryInfo[0];
+        }
+
+        public GroupIconDirectoryInfo[] DirectoryInfo { get { return this.images; } }
+
+        public void ReadFromFile(Stream stream)
+        {
+            BinaryReader reader = new BinaryReader(stream);
+            this.Read(reader, true);
+        }
+
+        public void ReadFromResource(byte[] data)
+        {
+            using (BinaryReader reader = new BinaryReader(new MemoryStream(data, false)))
+            {
+                this.Read(reader, false);
+            }
+        }
+
+        public byte[] GetResourceData()
+        {
+            byte[] data = null;
+
+            using (MemoryStream stream = new MemoryStream())
+            {
+                BinaryWriter writer = new BinaryWriter(stream);
+                writer.Write(this.reserved);
+                writer.Write((ushort)this.type);
+                writer.Write((ushort)this.images.Length);
+                for (int i = 0; i < this.images.Length; ++i)
+                {
+                    writer.Write(this.images[i].width);
+                    writer.Write(this.images[i].height);
+                    writer.Write(this.images[i].colors);
+                    writer.Write(this.images[i].reserved);
+                    writer.Write(this.images[i].planes);
+                    writer.Write(this.images[i].bitsPerPixel);
+                    writer.Write(this.images[i].imageSize);
+                    writer.Write(this.images[i].imageIndex);
+                }
+
+                data = new byte[stream.Length];
+                stream.Seek(0, SeekOrigin.Begin);
+                stream.Read(data, 0, data.Length);
+            }
+
+            return data;
+        }
+
+        private void Read(BinaryReader reader, bool readFromFile)
+        {
+            this.reserved = reader.ReadUInt16();
+            this.type = (GroupIconType)reader.ReadUInt16();
+
+            int imageCount = reader.ReadUInt16();
+            this.images = new GroupIconDirectoryInfo[imageCount];
+            for (int i = 0; i < imageCount; ++i)
+            {
+                this.images[i].width = reader.ReadByte();
+                this.images[i].height = reader.ReadByte();
+                this.images[i].colors = reader.ReadByte();
+                this.images[i].reserved = reader.ReadByte();
+                this.images[i].planes = reader.ReadUInt16();
+                this.images[i].bitsPerPixel = reader.ReadUInt16();
+                this.images[i].imageSize = reader.ReadUInt32();
+                if (readFromFile)
+                {
+                    this.images[i].imageOffset = reader.ReadUInt32();
+                    this.images[i].imageIndex = (ushort)(i + 1);
+                }
+                else
+                {
+                    this.images[i].imageIndex = reader.ReadUInt16();
+                }
+            }
+        }
+
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/GroupIconResource.cs b/src/dtf/WixToolset.Dtf.Resources/GroupIconResource.cs
new file mode 100644
index 00000000..8820ce75
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/GroupIconResource.cs
@@ -0,0 +1,120 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Reflection;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// A subclass of Resource which provides specific methods for manipulating the resource data.
+    /// </summary>
+    /// <remarks>
+    /// The resource is of type <see cref="ResourceType.GroupIcon"/> (RT_GROUPICON).
+    /// </remarks>
+    public sealed class GroupIconResource : Resource
+    {
+        internal bool dirty;
+        private GroupIconInfo rawGroupIconInfo;
+        private List<Resource> icons;
+
+        /// <summary>
+        /// Creates a new GroupIconResource object without any data. The data can be later loaded from a file.
+        /// </summary>
+        /// <param name="name">Name of the resource. For a numeric resource identifier, prefix the decimal number with a "#".</param>
+        /// <param name="locale">Locale of the resource</param>
+        public GroupIconResource(string name, int locale)
+            : this(name, locale, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new GroupIconResource object with data. The data can be later saved to a file.
+        /// </summary>
+        /// <param name="name">Name of the resource. For a numeric resource identifier, prefix the decimal number with a "#".</param>
+        /// <param name="locale">Locale of the resource</param>
+        /// <param name="data">Raw resource data</param>
+        public GroupIconResource(string name, int locale, byte[] data)
+            : base(ResourceType.GroupIcon, name, locale, data)
+        {
+            this.RefreshIconGroupInfo(data);
+        }
+
+        /// <summary>
+        /// Gets or sets the raw data of the resource.  The data is in the format of the RT_GROUPICON resource structure.
+        /// </summary>
+        public override byte[] Data
+        {
+            get
+            {
+                if (this.dirty)
+                {
+                    base.Data = this.rawGroupIconInfo.GetResourceData();
+                    this.dirty = false;
+                }
+
+                return base.Data;
+            }
+            set
+            {
+                this.RefreshIconGroupInfo(value);
+
+                base.Data = value;
+                this.dirty = false;
+            }
+        }
+
+        /// <summary>
+        /// Enumerates the the icons in the icon group.
+        /// </summary>
+        public IEnumerable<Resource> Icons { get { return this.icons; } }
+
+        /// <summary>
+        /// Reads the icon group from a .ico file.
+        /// </summary>
+        /// <param name="path">Path to an icon file (.ico).</param>
+        public void ReadFromFile(string path)
+        {
+            this.rawGroupIconInfo = new GroupIconInfo();
+            this.icons = new List<Resource>();
+            using (FileStream fs = File.Open(path, FileMode.Open, FileAccess.Read, FileShare.Read))
+            {
+                this.rawGroupIconInfo.ReadFromFile(fs);
+
+                // After reading the group icon info header from the file, read all the icons.
+                for (int i = 0; i < this.rawGroupIconInfo.DirectoryInfo.Length; ++i)
+                {
+                    ushort index = this.rawGroupIconInfo.DirectoryInfo[i].imageIndex;
+                    uint offset = this.rawGroupIconInfo.DirectoryInfo[i].imageOffset;
+                    uint size = this.rawGroupIconInfo.DirectoryInfo[i].imageSize;
+                    byte[] data = new byte[size];
+
+                    fs.Seek(offset, SeekOrigin.Begin);
+                    fs.Read(data, 0, data.Length);
+
+                    Resource resource = new Resource(ResourceType.Icon, String.Concat("#", index), this.Locale, data);
+                    this.icons.Add(resource);
+                }
+            }
+
+            this.dirty = true;
+        }
+
+        private void RefreshIconGroupInfo(byte[] refreshData)
+        {
+            this.rawGroupIconInfo = new GroupIconInfo();
+            this.icons = new List<Resource>();
+            if (refreshData != null)
+            {
+                this.rawGroupIconInfo.ReadFromResource(refreshData);
+            }
+
+            this.dirty = true;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/NativeMethods.cs b/src/dtf/WixToolset.Dtf.Resources/NativeMethods.cs
new file mode 100644
index 00000000..bf1bd1dc
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/NativeMethods.cs
@@ -0,0 +1,55 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Reflection;
+    using System.Collections;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+
+    internal static class NativeMethods
+    {
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern IntPtr LoadLibraryEx(string fileName, IntPtr hFile, uint flags);
+        internal const uint LOAD_LIBRARY_AS_DATAFILE = 2;
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool FreeLibrary(IntPtr module);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EnumResourceTypes(IntPtr module, EnumResTypesProc enumFunc, IntPtr param);
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal delegate bool EnumResTypesProc(IntPtr module, IntPtr type, IntPtr param);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EnumResourceNames(IntPtr module, IntPtr type, EnumResNamesProc enumFunc, IntPtr param);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EnumResourceNames(IntPtr module, string type, EnumResNamesProc enumFunc, IntPtr param);
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal delegate bool EnumResNamesProc(IntPtr module, IntPtr type, IntPtr name, IntPtr param);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EnumResourceLanguages(IntPtr module, IntPtr type, IntPtr name, EnumResLangsProc enumFunc, IntPtr param);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EnumResourceLanguages(IntPtr module, string type, string name, EnumResLangsProc enumFunc, IntPtr param);
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal delegate bool EnumResLangsProc(IntPtr module, IntPtr type, IntPtr name, ushort langId, IntPtr param);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern IntPtr FindResourceEx(IntPtr module, string type, string name, ushort langId);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern IntPtr LoadResource(IntPtr module, IntPtr resourceInfo);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern IntPtr LockResource(IntPtr resourceData);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern uint SizeofResource(IntPtr module, IntPtr resourceInfo);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        internal static extern IntPtr BeginUpdateResource(string fileName, [MarshalAs(UnmanagedType.Bool)] bool deleteExistingResources);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool UpdateResource(IntPtr updateHandle, IntPtr type, IntPtr name, ushort lcid, IntPtr data, uint dataSize);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)][return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool UpdateResource(IntPtr updateHandle, IntPtr type, string name, ushort lcid, IntPtr data, uint dataSize);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool UpdateResource(IntPtr updateHandle, string type, string name, ushort lcid, IntPtr data, uint dataSize);
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)] [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool EndUpdateResource(IntPtr updateHandle, [MarshalAs(UnmanagedType.Bool)] bool discardChanges);
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/Resource.cs b/src/dtf/WixToolset.Dtf.Resources/Resource.cs
new file mode 100644
index 00000000..23b4621f
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/Resource.cs
@@ -0,0 +1,225 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Reflection;
+    using System.Collections;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Represents a Win32 resource which can be loaded from and saved to a PE file.
+    /// </summary>
+    public class Resource
+    {
+        private ResourceType type;
+        private string name;
+        private int locale;
+        private byte[] data;
+
+        /// <summary>
+        /// Creates a new Resource object without any data. The data can be later loaded from a file.
+        /// </summary>
+        /// <param name="type">Type of the resource; may be one of the ResourceType constants or a user-defined type.</param>
+        /// <param name="name">Name of the resource. For a numeric resource identifier, prefix the decimal number with a "#".</param>
+        /// <param name="locale">Locale of the resource</param>
+        public Resource(ResourceType type, string name, int locale)
+            : this(type, name, locale, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new Resource object with data. The data can be later saved to a file.
+        /// </summary>
+        /// <param name="type">Type of the resource; may be one of the ResourceType constants or a user-defined type.</param>
+        /// <param name="name">Name of the resource. For a numeric resource identifier, prefix the decimal number with a "#".</param>
+        /// <param name="locale">Locale of the resource</param>
+        /// <param name="data">Raw resource data</param>
+        public Resource(ResourceType type, string name, int locale, byte[] data)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException("name");
+            }
+
+            this.type = type;
+            this.name = name;
+            this.locale = locale;
+            this.data = data;
+        }
+
+        /// <summary>
+        /// Gets or sets the type of the resource.  This may be one of the ResourceType constants
+        /// or a user-defined type name.
+        /// </summary>
+        public ResourceType ResourceType
+        {
+            get { return this.type; }
+            set { this.type = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the resource.  For a numeric resource identifier, the decimal number is prefixed with a "#".
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return this.name;
+            }
+
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException("value");
+                }
+
+                this.name = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the locale of the resource.
+        /// </summary>
+        public int Locale
+        {
+            get { return this.locale; }
+            set { this.locale = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the raw data of the resource.
+        /// </summary>
+        [SuppressMessage("Microsoft.Performance", "CA1819:PropertiesShouldNotReturnArrays")]
+        public virtual byte[] Data
+        {
+            get { return this.data; }
+            set { this.data = value; }
+        }
+
+        /// <summary>
+        /// Loads the resource data from a file.  The file is searched for a resource with matching type, name, and locale.
+        /// </summary>
+        /// <param name="file">Win32 PE file containing the resource</param>
+        public void Load(string file)
+        {
+            IntPtr module = NativeMethods.LoadLibraryEx(file, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
+            try
+            {
+                this.Load(module);
+            }
+            finally
+            {
+                NativeMethods.FreeLibrary(module);
+            }
+        }
+
+        internal void Load(IntPtr module)
+        {
+            IntPtr resourceInfo = NativeMethods.FindResourceEx(module, (string) this.ResourceType, this.Name, (ushort) this.Locale);
+            if (resourceInfo != IntPtr.Zero)
+            {
+                uint resourceLength = NativeMethods.SizeofResource(module, resourceInfo);
+                IntPtr resourceData = NativeMethods.LoadResource(module, resourceInfo);
+                IntPtr resourcePtr = NativeMethods.LockResource(resourceData);
+                byte[] resourceBytes = new byte[resourceLength];
+                Marshal.Copy(resourcePtr, resourceBytes, 0, resourceBytes.Length);
+                this.Data = resourceBytes;
+            }
+            else
+            {
+                this.Data = null;
+            }
+        }
+
+        /// <summary>
+        /// Saves the resource to a file.  Any existing resource data with matching type, name, and locale is overwritten.
+        /// </summary>
+        /// <param name="file">Win32 PE file to contain the resource</param>
+        public void Save(string file)
+        {
+            IntPtr updateHandle = IntPtr.Zero;
+            try
+            {
+                updateHandle = NativeMethods.BeginUpdateResource(file, false);
+                this.Save(updateHandle);
+                if (!NativeMethods.EndUpdateResource(updateHandle, false))
+                {
+                    int err = Marshal.GetLastWin32Error();
+                    throw new IOException(String.Format(CultureInfo.InvariantCulture, "Failed to save resource. Error code: {0}", err));
+                }
+                updateHandle = IntPtr.Zero;
+            }
+            finally
+            {
+                if (updateHandle != IntPtr.Zero)
+                {
+                    NativeMethods.EndUpdateResource(updateHandle, true);
+                }
+            }
+        }
+
+        internal void Save(IntPtr updateHandle)
+        {
+            IntPtr dataPtr = IntPtr.Zero;
+            try
+            {
+                int dataLength = 0;
+                if (this.Data != null)
+                {
+                    dataLength = this.Data.Length;
+                    dataPtr = Marshal.AllocHGlobal(dataLength);
+                    Marshal.Copy(this.Data, 0, dataPtr, dataLength);
+                }
+                bool updateSuccess;
+                if (this.Name.StartsWith("#", StringComparison.Ordinal))
+                {
+                    // A numeric-named resource must be saved via the integer version of UpdateResource.
+                    IntPtr intName = new IntPtr(Int32.Parse(this.Name.Substring(1), CultureInfo.InvariantCulture));
+                    updateSuccess = NativeMethods.UpdateResource(updateHandle, new IntPtr(this.ResourceType.IntegerValue), intName, (ushort) this.Locale, dataPtr, (uint) dataLength);
+                }
+                else
+                {
+                    updateSuccess = NativeMethods.UpdateResource(updateHandle, (string) this.ResourceType, this.Name, (ushort) this.Locale, dataPtr, (uint) dataLength);
+                }
+                if (!updateSuccess)
+                {
+                    throw new IOException("Failed to save resource. Error: " + Marshal.GetLastWin32Error());
+                }
+            }
+            finally
+            {
+                if (dataPtr != IntPtr.Zero)
+                {
+                    Marshal.FreeHGlobal(dataPtr);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Tests if type, name, and locale of this Resource object match another Resource object.
+        /// </summary>
+        /// <param name="obj">Resource object to be compared</param>
+        /// <returns>True if the objects represent the same resource; false otherwise.</returns>
+        public override bool Equals(object obj)
+        {
+            Resource res = obj as Resource;
+            if (res == null) return false;
+            return this.ResourceType == res.ResourceType && this.Name == res.Name && this.Locale == res.Locale;
+        }
+
+        /// <summary>
+        /// Gets a hash code for this Resource object.
+        /// </summary>
+        /// <returns>Hash code generated from the resource type, name, and locale.</returns>
+        public override int GetHashCode()
+        {
+            return this.ResourceType.GetHashCode() ^ this.Name.GetHashCode() ^ this.Locale.GetHashCode();
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/ResourceCollection.cs b/src/dtf/WixToolset.Dtf.Resources/ResourceCollection.cs
new file mode 100644
index 00000000..5d9e5653
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/ResourceCollection.cs
@@ -0,0 +1,340 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Reflection;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Allows reading and editing of resource data in a Win32 PE file.
+    /// </summary>
+    /// <remarks>
+    /// To use this class:<list type="number">
+    /// <item>Create a new ResourceCollection</item>
+    /// <item>Locate resources for the collection by calling one of the <see cref="ResourceCollection.Find(string)"/> methods</item>
+    /// <item>Load data of one or more <see cref="Resource"/>s from a file by calling the <see cref="Load"/> method of the
+    /// Resource class, or load them all at once (more efficient) with the <see cref="Load"/> method of the ResourceCollection.</item>
+    /// <item>Read and/or edit data of the individual Resource objects using the methods on that class.</item>
+    /// <item>Save data of one or more <see cref="Resource"/>s to a file by calling the <see cref="Save"/> method of the
+    /// Resource class, or save them all at once (more efficient) with the <see cref="Save"/> method of the ResourceCollection.</item>
+    /// </list>
+    /// </remarks>
+    public class ResourceCollection : ICollection<Resource>
+    {
+        private List<Resource> resources;
+
+        /// <summary>
+        /// Creates a new, empty ResourceCollection.
+        /// </summary>
+        public ResourceCollection()
+        {
+            this.resources = new List<Resource>();
+        }
+
+        /// <summary>
+        /// Locates all resources in a file, including all resource types and languages.  For each located resource,
+        /// a <see cref="Resource"/> instance (or subclass) is added to the collection.
+        /// </summary>
+        /// <param name="resFile">The file to be searched for resources.</param>
+        /// <exception cref="IOException">resources could not be read from the file</exception>
+        public void Find(string resFile)
+        {
+            this.Clear();
+
+            IntPtr module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
+            if (module == IntPtr.Zero)
+            {
+                int err = Marshal.GetLastWin32Error();
+                throw new IOException(String.Format(CultureInfo.InvariantCulture, "Failed to load resource file. Error code: {0}", err));
+            }
+            try
+            {
+                if (!NativeMethods.EnumResourceTypes(module, new NativeMethods.EnumResTypesProc(this.EnumResTypes), IntPtr.Zero))
+                {
+                    int err = Marshal.GetLastWin32Error();
+                    throw new IOException(String.Format(CultureInfo.InvariantCulture, "Failed to enumerate resources. Error code: {0}", err));
+                }
+            }
+            finally
+            {
+                NativeMethods.FreeLibrary(module);
+            }
+        }
+
+        /// <summary>
+        /// Locates all resources in a file of a given type, including all languages.  For each located resource,
+        /// a <see cref="Resource"/> instance (or subclass) is added to the collection.
+        /// </summary>
+        /// <param name="resFile">The file to be searched for resources.</param>
+        /// <param name="type">The type of resource to search for; may be one of the ResourceType constants or a user-defined type.</param>
+        /// <exception cref="IOException">resources could not be read from the file</exception>
+        public void Find(string resFile, ResourceType type)
+        {
+            this.Clear();
+
+            IntPtr module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
+            try
+            {
+                if (!NativeMethods.EnumResourceNames(module, (string) type, new NativeMethods.EnumResNamesProc(this.EnumResNames), IntPtr.Zero))
+                {
+                    int err = Marshal.GetLastWin32Error();
+                    throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceNames error. Error code: {0}", err));
+                }
+            }
+            finally
+            {
+                NativeMethods.FreeLibrary(module);
+            }
+        }
+
+        /// <summary>
+        /// Locates all resources in a file of a given type and language.  For each located resource,
+        /// a <see cref="Resource"/> instance (or subclass) is added to the collection.
+        /// </summary>
+        /// <param name="resFile">The file to be searched for resources.</param>
+        /// <param name="type">The type of resource to search for; may be one of the ResourceType constants or a user-defined type.</param>
+        /// <param name="name">The name of the resource to search for.</param>
+        /// <exception cref="IOException">resources could not be read from the file</exception>
+        public void Find(string resFile, ResourceType type, string name)
+        {
+            this.Clear();
+
+            IntPtr module = NativeMethods.LoadLibraryEx(resFile, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
+            try
+            {
+                if (!NativeMethods.EnumResourceLanguages(module, (string) type, name, new NativeMethods.EnumResLangsProc(this.EnumResLangs), IntPtr.Zero))
+                {
+                    int err = Marshal.GetLastWin32Error();
+                    throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceLanguages error. Error code: {0}", err));
+                }
+            }
+            finally
+            {
+                NativeMethods.FreeLibrary(module);
+            }
+        }
+
+        private bool EnumResTypes(IntPtr module, IntPtr type, IntPtr param)
+        {
+            if (!NativeMethods.EnumResourceNames(module, type, new NativeMethods.EnumResNamesProc(EnumResNames), IntPtr.Zero))
+            {
+                int err = Marshal.GetLastWin32Error();
+                throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceNames error! Error code: {0}", err));
+            }
+            return true;
+        }
+
+        private bool EnumResNames(IntPtr module, IntPtr type, IntPtr name, IntPtr param)
+        {
+            if (!NativeMethods.EnumResourceLanguages(module, type, name, new NativeMethods.EnumResLangsProc(EnumResLangs), IntPtr.Zero))
+            {
+                int err = Marshal.GetLastWin32Error();
+                throw new IOException(String.Format(CultureInfo.InvariantCulture, "EnumResourceLanguages error. Error code: {0}", err));
+            }
+            return true;
+        }
+
+        private bool EnumResLangs(IntPtr module, IntPtr type, IntPtr name, ushort langId, IntPtr param)
+        {
+            Resource res;
+            if (((int) type) == ResourceType.Version.IntegerValue)
+            {
+                res = new VersionResource(ResourceNameToString(name), langId);
+            }
+            else
+            {
+                res = new Resource(ResourceNameToString(type), ResourceNameToString(name), langId);
+            }
+
+            if (!this.Contains(res))
+            {
+                this.Add(res);
+            }
+
+            return true;
+        }
+
+        private static string ResourceNameToString(IntPtr resName)
+        {
+            if ((resName.ToInt64() >> 16) == 0)
+            {
+                return "#" + resName.ToString();
+            }
+            else
+            {
+                return Marshal.PtrToStringAuto(resName);
+            }
+        }
+
+        /// <summary>
+        /// For all resources in the collection, loads their data from a resource file.
+        /// </summary>
+        /// <param name="file">The file from which resources are loaded.</param>
+        public void Load(string file)
+        {
+            IntPtr module = NativeMethods.LoadLibraryEx(file, IntPtr.Zero, NativeMethods.LOAD_LIBRARY_AS_DATAFILE);
+            try
+            {
+                foreach (Resource res in this)
+                {
+                    res.Load(module);
+                }
+            }
+            finally
+            {
+                NativeMethods.FreeLibrary(module);
+            }
+        }
+
+        /// <summary>
+        /// For all resources in the collection, saves their data to a resource file.
+        /// </summary>
+        /// <param name="file">The file to which resources are saved.</param>
+        public void Save(string file)
+        {
+            IntPtr updateHandle = IntPtr.Zero;
+            try
+            {
+                updateHandle = NativeMethods.BeginUpdateResource(file, false);
+                foreach (Resource res in this)
+                {
+                    res.Save(updateHandle);
+                }
+                if (!NativeMethods.EndUpdateResource(updateHandle, false))
+                {
+                    int err = Marshal.GetLastWin32Error();
+                    throw new IOException(String.Format(CultureInfo.InvariantCulture, "Failed to save resource. Error {0}", err));
+                }
+                updateHandle = IntPtr.Zero;
+            }
+            finally
+            {
+                if (updateHandle != IntPtr.Zero)
+                {
+                    NativeMethods.EndUpdateResource(updateHandle, true);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the element at the specified index.
+        /// </summary>
+        public Resource this[int index]
+        {
+            get
+            {
+                return (Resource) this.resources[index];
+            }
+            set
+            {
+                this.resources[index] = value;
+            }
+        }
+
+        /// <summary>
+        /// Adds a new item to the collection.
+        /// </summary>
+        /// <param name="item">The Resource to add.</param>
+        public void Add(Resource item)
+        {
+            this.resources.Add(item);
+        }
+
+        /// <summary>
+        /// Removes an item to the collection.
+        /// </summary>
+        /// <param name="item">The Resource to remove.</param>
+        public bool Remove(Resource item)
+        {
+            return this.resources.Remove(item);
+        }
+
+        /// <summary>
+        /// Gets the index of an item in the collection.
+        /// </summary>
+        /// <param name="item">The Resource to search for.</param>
+        /// <returns>The index of the item, or -1 if not found.</returns>
+        public int IndexOf(Resource item)
+        {
+            return this.resources.IndexOf(item);
+        }
+
+        /// <summary>
+        /// Inserts a item into the collection.
+        /// </summary>
+        /// <param name="index">The insertion index.</param>
+        /// <param name="item">The Resource to insert.</param>
+        public void Insert(int index, Resource item)
+        {
+            this.resources.Insert(index, item);
+        }
+
+        /// <summary>
+        /// Tests if the collection contains an item.
+        /// </summary>
+        /// <param name="item">The Resource to search for.</param>
+        /// <returns>true if the item is found; false otherwise</returns>
+        public bool Contains(Resource item)
+        {
+            return this.resources.Contains(item);
+        }
+
+        /// <summary>
+        /// Copies the collection into an array.
+        /// </summary>
+        /// <param name="array">The array to copy into.</param>
+        /// <param name="arrayIndex">The starting index in the destination array.</param>
+        public void CopyTo(Resource[] array, int arrayIndex)
+        {
+            this.resources.CopyTo(array, arrayIndex);
+        }
+
+        /// <summary>
+        /// Removes all resources from the collection.
+        /// </summary>
+        public void Clear()
+        {
+            this.resources.Clear();
+        }
+
+        /// <summary>
+        /// Gets the number of resources in the collection.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return this.resources.Count;
+            }
+        }
+
+        /// <summary>
+        /// Gets an enumerator over all resources in the collection.
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerator<Resource> GetEnumerator()
+        {
+            return this.resources.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return ((IEnumerable) this.resources).GetEnumerator();
+        }
+
+        bool ICollection<Resource>.IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/ResourceType.cs b/src/dtf/WixToolset.Dtf.Resources/ResourceType.cs
new file mode 100644
index 00000000..4b3971ab
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/ResourceType.cs
@@ -0,0 +1,198 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+
+    /// <summary>
+    /// Represents either a standard integer resource type or a custom resource type name.
+    /// </summary>
+    public class ResourceType
+    {
+        // Silence warnings about doc-comments
+        #pragma warning disable 1591
+
+        public static ResourceType None          { get { return "#0"; } }
+        public static ResourceType Cursor        { get { return "#1"; } }
+        public static ResourceType Bitmap        { get { return "#2"; } }
+        public static ResourceType Icon          { get { return "#3"; } }
+        public static ResourceType Menu          { get { return "#4"; } }
+        public static ResourceType Dialog        { get { return "#5"; } }
+        public static ResourceType String        { get { return "#6"; } }
+        public static ResourceType FontDir       { get { return "#7"; } }
+        public static ResourceType Font          { get { return "#8"; } }
+        public static ResourceType Accelerator   { get { return "#9"; } }
+        public static ResourceType RCData        { get { return "#10"; } }
+        public static ResourceType MessageTable  { get { return "#11"; } }
+        public static ResourceType GroupCursor   { get { return "#12"; } }
+        public static ResourceType GroupIcon     { get { return "#14"; } }
+        public static ResourceType Version       { get { return "#16"; } }
+        public static ResourceType DialogInclude { get { return "#17"; } }
+        public static ResourceType PlugPlay      { get { return "#19"; } }
+        public static ResourceType Vxd           { get { return "#20"; } }
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ani")]
+        public static ResourceType AniCursor     { get { return "#21"; } }
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ani")]
+        public static ResourceType AniIcon       { get { return "#22"; } }
+        public static ResourceType Html          { get { return "#23"; } }
+        public static ResourceType Manifest      { get { return "#24"; } }
+
+        #pragma warning restore 1591
+
+        private string resourceType;
+
+        /// <summary>
+        /// Creates a new resource type from a string resource name.
+        /// </summary>
+        /// <param name="resourceType">String resource name,
+        /// or an integer resource type prefixed by a #.</param>
+        public ResourceType(string resourceType)
+        {
+            if (string.IsNullOrEmpty(resourceType))
+            {
+                throw new ArgumentNullException("resourceType");
+            }
+
+            this.resourceType = resourceType;
+
+            if (this.IsInteger && this.IntegerValue < 0)
+            {
+                throw new ArgumentOutOfRangeException("Invalid integer resource type value.");
+            }
+        }
+
+        /// <summary>
+        /// Creates a new integer resource type.
+        /// </summary>
+        /// <param name="resourceType">Integer value of a well-known resource type.</param>
+        public ResourceType(int resourceType)
+            : this("#" + resourceType)
+        {
+        }
+
+        /// <summary>
+        /// Gets a flag indicating whether the resource type is an integer type.
+        /// </summary>
+        public bool IsInteger
+        {
+            get
+            {
+                return this.resourceType.StartsWith("#", StringComparison.Ordinal);
+            }
+        }
+
+        /// <summary>
+        /// Gets the integer value of the resource type, or -1 if the resource type is not an integer.
+        /// </summary>
+        public int IntegerValue
+        {
+            get
+            {
+                int value;
+                if (!this.IsInteger ||
+                    !Int32.TryParse(this.resourceType.Substring(1), out value))
+                {
+                    value = -1;
+                }
+
+                return value;
+            }
+        }
+
+        /// <summary>
+        /// Gets a string representation of the resource type.
+        /// </summary>
+        /// <returns>The custom resource name, or the name of a well-known resource type.</returns>
+        public override string ToString()
+        {
+            if (this.IsInteger)
+            {
+                switch (this.IntegerValue)
+                {
+                    case  0: return "None";
+                    case  1: return "Cursor";
+                    case  2: return "Bitmap";
+                    case  3: return "Icon";
+                    case  4: return "Menu";
+                    case  5: return "Dialog";
+                    case  6: return "String";
+                    case  7: return "FontDir";
+                    case  8: return "Font";
+                    case  9: return "Accelerator";
+                    case 10: return "RCData";
+                    case 11: return "MessageTable";
+                    case 12: return "GroupCursor";
+                    case 14: return "GroupIcon";
+                    case 16: return "Version";
+                    case 17: return "DialogInclude";
+                    case 19: return "PlugPlay";
+                    case 20: return "Vxd";
+                    case 21: return "AniCursor";
+                    case 22: return "AniIcon";
+                    case 23: return "Html";
+                    case 24: return "Manifest";
+                }
+            }
+
+            return this.resourceType;
+        }
+
+        /// <summary>
+        /// Tests whether one resource type equals another object.
+        /// </summary>
+        /// <param name="obj">Other object.</param>
+        /// <returns>True if equal, else false.</returns>
+        public override bool Equals(object obj)
+        {
+            return this.Equals(obj as ResourceType);
+        }
+
+        /// <summary>
+        /// Tests whether one resource type equals another.
+        /// </summary>
+        /// <param name="otherType">Other resource type.</param>
+        /// <returns>True if equal, else false.</returns>
+        public bool Equals(ResourceType otherType)
+        {
+            return otherType != null && this.resourceType.Equals(otherType.resourceType, StringComparison.Ordinal);
+        }
+
+        /// <summary>
+        /// Gets a hash code suitable for using the resource type as a dictionary key.
+        /// </summary>
+        /// <returns>Hash code based on the resource type string.</returns>
+        public override int GetHashCode()
+        {
+            return this.resourceType.GetHashCode();
+        }
+
+        /// <summary>
+        /// Implicitly converts a string to a ResourceType.
+        /// </summary>
+        /// <param name="resourceType">String resource type to convert.</param>
+        /// <returns>ResourceType object.</returns>
+        public static implicit operator ResourceType(string resourceType)
+        {
+            return new ResourceType(resourceType);
+        }
+
+        /// <summary>
+        /// Explicitly converts a ResourceType to a string.
+        /// </summary>
+        /// <param name="resourceType">ResourceType object to convert.</param>
+        /// <returns>The resource type string.</returns>
+        /// <remarks>
+        /// Unlike <see cref="ToString" />, this conversion does not return
+        /// the common name of well-known integer resource types. Therefore,
+        /// the returned string is suitable for passing directly to Win32
+        /// resource APIs that accept resource type strings.
+        /// </remarks>
+        public static explicit operator string(ResourceType resourceType)
+        {
+            return resourceType.resourceType;
+        }
+    }
+}
+
diff --git a/src/dtf/WixToolset.Dtf.Resources/VersionEnums.cs b/src/dtf/WixToolset.Dtf.Resources/VersionEnums.cs
new file mode 100644
index 00000000..96e54b51
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/VersionEnums.cs
@@ -0,0 +1,86 @@
+// 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.Dtf.Resources
+{
+    // Silence warnings about doc-comments
+    #pragma warning disable 1591
+
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Identifies build types of a versioned file.
+    /// </summary>
+    [Flags]
+    public enum VersionBuildTypes : int
+    {
+        None         = 0x00,
+        Debug        = 0x01,
+        Prerelease   = 0x02,
+        Patched      = 0x04,
+        PrivateBuild = 0x08,
+        InfoInferred = 0x10,
+        SpecialBuild = 0x20,
+    }
+
+    [SuppressMessage("Microsoft.Design", "CA1027:MarkEnumsWithFlags")]
+    internal enum VersionFileOS : int
+    {
+        Unknown       = 0x00000000,
+        DOS           = 0x00010000,
+        OS216         = 0x00020000,
+        OS232         = 0x00030000,
+        NT            = 0x00040000,
+        WINCE         = 0x00050000,
+        WINDOWS16     = 0x00000001,
+        PM16          = 0x00000002,
+        PM32          = 0x00000003,
+        WINDOWS32     = 0x00000004,
+        DOS_WINDOWS16 = 0x00010001,
+        DOS_WINDOWS32 = 0x00010004,
+        OS216_PM16    = 0x00020002,
+        OS232_PM32    = 0x00030003,
+        NT_WINDOWS32  = 0x00040004,
+    }
+
+    /// <summary>
+    /// Identifies the type of a versioned file.
+    /// </summary>
+    [SuppressMessage("Microsoft.Design", "CA1027:MarkEnumsWithFlags")]
+    public enum VersionFileType : int
+    {
+        Unknown       = 0,
+        Application   = 1,
+        Dll           = 2,
+        Driver        = 3,
+        Font          = 4,
+        VirtualDevice = 5,
+        StaticLibrary = 7,
+    }
+
+    /// <summary>
+    /// Identifies the sub-type of a versioned file.
+    /// </summary>
+    public enum VersionFileSubtype : int
+    {
+        Unknown                = 0,
+        PrinterDriver          = 1,
+        KeyboardDriver         = 2,
+        LanguageDriver         = 3,
+        DisplayDriver          = 4,
+        MouseDriver            = 5,
+        NetworkDriver          = 6,
+        SystemDriver           = 7,
+        InstallableDriver      = 8,
+        SoundDriver            = 9,
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Comm")]
+        CommDriver             = 10,
+        InputMethodDriver      = 11,
+        VersionedPrinterDriver = 12,
+        RasterFont             = 1,
+        VectorFont             = 2,
+        TrueTypeFont           = 3,
+    }
+
+    #pragma warning restore 1591
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/VersionInfo.cs b/src/dtf/WixToolset.Dtf.Resources/VersionInfo.cs
new file mode 100644
index 00000000..38224d12
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/VersionInfo.cs
@@ -0,0 +1,270 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Reflection;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Globalization;
+
+    internal class VersionInfo : ICollection<VersionInfo>
+    {
+        private string key;
+        private bool isString;
+        private byte[] data;
+        private List<VersionInfo> children;
+
+        public VersionInfo(string key)
+            : base()
+        {
+            if (key == null)
+            {
+                throw new ArgumentNullException("key");
+            }
+
+            this.key = key;
+            this.children = new List<VersionInfo>();
+        }
+
+        public string Key
+        {
+            get
+            {
+                return this.key;
+            }
+
+            set
+            {
+                if (value == null)
+                {
+                    throw new ArgumentNullException("value");
+                }
+
+                this.key = value;
+            }
+        }
+
+        public bool IsString
+        {
+            get
+            {
+                return this.isString;
+            }
+            
+            set
+            {
+                this.isString = value;
+            }
+        }
+
+        public byte[] Data
+        {
+            get
+            {
+                return this.data;
+            }
+
+            set
+            {
+                this.data = value;
+                this.isString = false;
+            }
+        }
+
+        public void Read(BinaryReader reader)
+        {
+            long basePosition = reader.BaseStream.Position;
+            int verInfoSize = (int) reader.ReadUInt16();
+            int valueSize = (int) reader.ReadUInt16();
+            bool dataIsString = (reader.ReadUInt16() != 0);
+            StringBuilder keyStringBuilder = new StringBuilder();
+            char c;
+            while ((c = (char) reader.ReadUInt16()) != 0)
+            {
+                keyStringBuilder.Append(c);
+            }
+            this.Key = keyStringBuilder.ToString();
+            Pad(reader, basePosition);
+            if (valueSize == 0)
+            {
+                this.data = null;
+            }
+            else
+            {
+                if (dataIsString) valueSize *= 2; // Count is # of chars instead of bytes
+                this.data = reader.ReadBytes(valueSize);
+                this.isString = dataIsString;
+                Pad(reader, basePosition);
+            }
+
+            while (reader.BaseStream.Position - basePosition < verInfoSize)
+            {
+                Pad(reader, basePosition);
+                VersionInfo childVerInfo = new VersionInfo("");
+                childVerInfo.Read(reader);
+                this.children.Add(childVerInfo);
+            }
+        }
+
+        public void Write(BinaryWriter writer)
+        {
+            long basePosition = writer.BaseStream.Position;
+            writer.Write((ushort) this.Length);
+            byte[] valueBytes = this.data;
+            writer.Write((ushort) ((valueBytes != null ? valueBytes.Length : 0) / (this.IsString ? 2 : 1)));
+            writer.Write((ushort) (this.IsString ? 1 : 0));
+            byte[] keyBytes = new byte[Encoding.Unicode.GetByteCount(this.Key) + 2];
+            Encoding.Unicode.GetBytes(this.Key, 0, this.Key.Length, keyBytes, 0);
+            writer.Write(keyBytes);
+            Pad(writer, basePosition);
+            if (valueBytes != null)
+            {
+                writer.Write(valueBytes);
+                Pad(writer, basePosition);
+            }
+
+            foreach (VersionInfo childVersionInfo in this.children)
+            {
+                Pad(writer, basePosition);
+                childVersionInfo.Write(writer);
+            }
+        }
+
+        private static void Pad(BinaryReader reader, long basePosition)
+        {
+            long position = reader.BaseStream.Position;
+            int diff = (int) (position - basePosition) % 4;
+            if (diff > 0) while (diff++ < 4 && reader.BaseStream.Position < reader.BaseStream.Length) reader.ReadByte();
+        }
+        private static void Pad(BinaryWriter writer, long basePosition)
+        {
+            long position = writer.BaseStream.Position;
+            int diff = (int) (position - basePosition) % 4;
+            if (diff > 0) while (diff++ < 4) writer.Write((byte) 0);
+        }
+
+        private int Length
+        {
+            get
+            {
+                int len = 6 + Encoding.Unicode.GetByteCount(this.Key) + 2;
+                if (len % 4 > 0) len += (4 - len % 4);
+                len += (this.data != null ? this.data.Length : 0);
+                if (len % 4 > 0) len += (4 - len % 4);
+                foreach (VersionInfo childVersionInfo in this.children)
+                {
+                    if (len % 4 > 0) len += (4 - len % 4);
+                    len += childVersionInfo.Length;
+                }
+                return len;
+            }
+        }
+
+        public static explicit operator VersionInfo(byte[] bytesValue)
+        {
+            VersionInfo viValue = new VersionInfo("");
+            using (BinaryReader reader = new BinaryReader(new MemoryStream(bytesValue, false)))
+            {
+                viValue.Read(reader);
+            }
+            return viValue;
+        }
+
+        public static explicit operator byte[](VersionInfo viValue)
+        {
+            byte[] bytesValue = new byte[viValue.Length];
+            using (BinaryWriter writer = new BinaryWriter(new MemoryStream(bytesValue, true)))
+            {
+                viValue.Write(writer);
+            }
+            return bytesValue;
+        }
+
+        public VersionInfo this[string itemKey]
+        {
+            get
+            {
+                int index = this.IndexOf(itemKey);
+                if (index < 0) return null;
+                return this.children[index];
+            }
+        }
+
+        public void Add(VersionInfo item)
+        {
+            this.children.Add(item);
+        }
+
+        public bool Remove(VersionInfo item)
+        {
+            return this.children.Remove(item);
+        }
+
+        public bool Remove(string itemKey)
+        {
+            int index = this.IndexOf(itemKey);
+            if (index >= 0)
+            {
+                this.children.RemoveAt(index);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        private int IndexOf(string itemKey)
+        {
+            for (int i = 0; i < this.children.Count; i++)
+            {
+                if (this.children[i].Key == itemKey) return i;
+            }
+            return -1;
+        }
+
+        public bool Contains(VersionInfo item)
+        {
+            return this.children.Contains(item);
+        }
+
+        public void CopyTo(VersionInfo[] array, int index)
+        {
+            this.children.CopyTo(array, index);
+        }
+
+        public void Clear()
+        {
+            this.children.Clear();
+        }
+
+        public int Count
+        {
+            get
+            {
+                return this.children.Count;
+            }
+        }
+
+        public bool IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public IEnumerator<VersionInfo> GetEnumerator()
+        {
+            return this.children.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/VersionResource.cs b/src/dtf/WixToolset.Dtf.Resources/VersionResource.cs
new file mode 100644
index 00000000..9955fa03
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/VersionResource.cs
@@ -0,0 +1,415 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Reflection;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// A subclass of Resource which provides specific methods for manipulating the resource data.
+    /// </summary>
+    /// <remarks>
+    /// The resource is of type <see cref="ResourceType.Version"/> (RT_VERSION).
+    /// </remarks>
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+    public sealed class VersionResource : Resource, ICollection<VersionStringTable>
+    {
+        internal bool dirty;
+        private VersionInfo rawVersionInfo;
+        private FixedFileVersionInfo rawFileVersionInfo;
+
+        /// <summary>
+        /// Creates a new VersionResource object without any data. The data can be later loaded from a file.
+        /// </summary>
+        /// <param name="name">Name of the resource. For a numeric resource identifier, prefix the decimal number with a "#".</param>
+        /// <param name="locale">Locale of the resource</param>
+        public VersionResource(string name, int locale)
+            : this(name, locale, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new VersionResource object with data. The data can be later saved to a file.
+        /// </summary>
+        /// <param name="name">Name of the resource. For a numeric resource identifier, prefix the decimal number with a "#".</param>
+        /// <param name="locale">Locale of the resource</param>
+        /// <param name="data">Raw resource data</param>
+        public VersionResource(string name, int locale, byte[] data)
+            : base(ResourceType.Version, name, locale, data)
+        {
+            this.RefreshVersionInfo(data);
+        }
+
+        /// <summary>
+        /// Gets or sets the raw data of the resource.  The data is in the format of the VS_VERSIONINFO structure.
+        /// </summary>
+        public override byte[] Data
+        {
+            get
+            {
+                if (this.dirty)
+                {
+                    this.rawVersionInfo.Data = (byte[]) this.rawFileVersionInfo;
+                    base.Data = (byte[]) this.rawVersionInfo;
+                    this.dirty = false;
+                }
+
+                return base.Data;
+            }
+            set
+            {
+                base.Data = value;
+                this.RefreshVersionInfo(value);
+                this.dirty = false;
+            }
+        }
+
+        private void RefreshVersionInfo(byte[] refreshData)
+        {
+            if (refreshData == null)
+            {
+                this.rawVersionInfo = new VersionInfo("VS_VERSION_INFO");
+                this.rawFileVersionInfo = new FixedFileVersionInfo();
+            }
+            else
+            {
+                this.rawVersionInfo = (VersionInfo) refreshData;
+                this.rawFileVersionInfo = (FixedFileVersionInfo) this.rawVersionInfo.Data;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the binary locale-independent file version of the version resource.
+        /// </summary>
+        public Version FileVersion
+        {
+            get
+            {
+                return this.rawFileVersionInfo.FileVersion;
+            }
+            set
+            {
+                this.rawFileVersionInfo.FileVersion = value;
+                this.dirty = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the binary locale-independent product version of the version resource.
+        /// </summary>
+        public Version ProductVersion
+        {
+            get
+            {
+                return this.rawFileVersionInfo.ProductVersion;
+            }
+            set
+            {
+                this.rawFileVersionInfo.ProductVersion = value;
+                this.dirty = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a bitmask that specifies the build types of the file.
+        /// </summary>
+        public VersionBuildTypes BuildTypes
+        {
+            get
+            {
+                return this.rawFileVersionInfo.FileFlags &
+                    this.rawFileVersionInfo.FileFlagsMask;
+            }
+            set
+            {
+                this.rawFileVersionInfo.FileFlags = value;
+                this.rawFileVersionInfo.FileFlagsMask = value;
+                this.dirty = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the general type of the file.
+        /// </summary>
+        public VersionFileType FileType
+        {
+            get
+            {
+                return this.rawFileVersionInfo.FileType;
+            }
+            set
+            {
+                this.rawFileVersionInfo.FileType = value;
+                this.dirty = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the specific type of the file.
+        /// </summary>
+        public VersionFileSubtype FileSubtype
+        {
+            get
+            {
+                return this.rawFileVersionInfo.FileSubtype;
+            }
+            set
+            {
+                this.rawFileVersionInfo.FileSubtype = value;
+                this.dirty = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the binary creation date and time.
+        /// </summary>
+        public DateTime Timestamp
+        {
+            get
+            {
+                return this.rawFileVersionInfo.Timestamp;
+            }
+            set
+            {
+                this.rawFileVersionInfo.Timestamp = value;
+                this.dirty = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets the string table for a specific locale, or null if there is no table for that locale.
+        /// </summary>
+        /// <seealso cref="Add(int)"/>
+        /// <seealso cref="Remove(int)"/>
+        public VersionStringTable this[int locale]
+        {
+            get
+            {
+                VersionInfo svi = this.rawVersionInfo["StringFileInfo"];
+                if (svi != null)
+                {
+                    foreach (VersionInfo strings in svi)
+                    {
+                        int stringsLocale = UInt16.Parse(strings.Key.Substring(0, 4), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+                        if (stringsLocale == locale)
+                        {
+                            return new VersionStringTable(this, strings);
+                        }
+                    }
+                }
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Adds a new version string table for a locale.
+        /// </summary>
+        /// <param name="locale">Locale of the table</param>
+        /// <returns>The new string table, or the existing table if the locale already existed.</returns>
+        public VersionStringTable Add(int locale)
+        {
+            VersionInfo svi = this.rawVersionInfo["StringFileInfo"];
+            if (svi == null)
+            {
+                svi = new VersionInfo("StringFileInfo");
+                this.rawVersionInfo.Add(svi);
+            }
+            foreach (VersionInfo strings in svi)
+            {
+                int stringsLocale = UInt16.Parse(strings.Key.Substring(0, 4), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+                if (stringsLocale == locale)
+                {
+                    return new VersionStringTable(this, strings);
+                }
+            }
+
+            VersionInfo newStrings = new VersionInfo(
+                ((ushort) locale).ToString("x4", CultureInfo.InvariantCulture) + ((ushort) 1200).ToString("x4", CultureInfo.InvariantCulture));
+            svi.Add(newStrings);
+            this.dirty = true;
+
+            VersionInfo vvi = this.rawVersionInfo["VarFileInfo"];
+            if (vvi == null)
+            {
+                vvi = new VersionInfo("VarFileInfo");
+                vvi.Add(new VersionInfo("Translation"));
+                this.rawVersionInfo.Add(vvi);
+            }
+            VersionInfo tVerInfo = vvi["Translation"];
+            if (tVerInfo != null)
+            {
+                byte[] oldValue = tVerInfo.Data;
+                if (oldValue == null) oldValue = new byte[0];
+                tVerInfo.Data = new byte[oldValue.Length + 4];
+                Array.Copy(oldValue, tVerInfo.Data, oldValue.Length);
+                using (BinaryWriter bw = new BinaryWriter(new MemoryStream(tVerInfo.Data, oldValue.Length, 4, true)))
+                {
+                    bw.Write((ushort) locale);
+                    bw.Write((ushort) 1200);
+                }
+            }
+
+            return new VersionStringTable(this, newStrings);
+        }
+
+        /// <summary>
+        /// Removes a version string table for a locale.
+        /// </summary>
+        /// <param name="locale">Locale of the table</param>
+        public void Remove(int locale)
+        {
+            VersionInfo svi = this.rawVersionInfo["StringFileInfo"];
+            if (svi != null)
+            {
+                foreach (VersionInfo strings in svi)
+                {
+                    int stringsLocale = UInt16.Parse(strings.Key.Substring(0, 4), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+                    if (stringsLocale == locale)
+                    {
+                        svi.Remove(strings);
+                        this.dirty = true;
+                        break;
+                    }
+                }
+
+            }
+
+            VersionInfo vvi = this.rawVersionInfo["VarFileInfo"];
+            if (vvi != null)
+            {
+                VersionInfo tVerInfo = vvi["Translation"];
+                if (tVerInfo != null)
+                {
+                    byte[] newValue = new byte[tVerInfo.Data.Length];
+                    int j = 0;
+                    using (BinaryWriter bw = new BinaryWriter(new MemoryStream(newValue, 0, newValue.Length, true)))
+                    {
+                        using (BinaryReader br = new BinaryReader(new MemoryStream(tVerInfo.Data)))
+                        {
+                            for (int i = tVerInfo.Data.Length / 4; i > 0; i--)
+                            {
+                                ushort tLocale = br.ReadUInt16();
+                                ushort cp = br.ReadUInt16();
+                                if (tLocale != locale)
+                                {
+                                    bw.Write((ushort) tLocale);
+                                    bw.Write((ushort) cp);
+                                    j++;
+                                }
+                            }
+                        }
+                    }
+                    tVerInfo.Data = new byte[j * 4];
+                    Array.Copy(newValue, tVerInfo.Data, tVerInfo.Data.Length);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Checks if a version string table exists for a given locale.
+        /// </summary>
+        /// <param name="locale">Locale to search for</param>
+        /// <returns>True if a string table was found for the locale; false otherwise.</returns>
+        public bool Contains(int locale)
+        {
+            return this[locale] != null;
+        }
+
+        /// <summary>
+        /// Gets the number string tables in the version resource.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                VersionInfo svi = this.rawVersionInfo["StringFileInfo"];
+                return svi != null ? svi.Count : 0;
+            }
+        }
+
+        /// <summary>
+        /// Removes all string tables from the version resource.
+        /// </summary>
+        public void Clear()
+        {
+            VersionInfo svi = this.rawVersionInfo["StringFileInfo"];
+            if (svi != null)
+            {
+                svi.Clear();
+                this.dirty = true;
+            }
+        }
+
+        bool ICollection<VersionStringTable>.IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        void ICollection<VersionStringTable>.Add(VersionStringTable item)
+        {
+            throw new NotSupportedException();
+        }
+
+        bool ICollection<VersionStringTable>.Remove(VersionStringTable item)
+        {
+            throw new NotSupportedException();
+        }
+
+        bool ICollection<VersionStringTable>.Contains(VersionStringTable item)
+        {
+            throw new NotSupportedException();
+        }
+
+        /// <summary>
+        /// Copies the version string tables to an array, starting at a particular array index.
+        /// </summary>
+        /// <param name="array">The one-dimensional Array that is the destination of the elements copied
+        /// from the collection. The Array must have zero-based indexing.</param>
+        /// <param name="arrayIndex">The zero-based index in array at which copying begins.</param>
+        public void CopyTo(VersionStringTable[] array, int arrayIndex)
+        {
+            VersionInfo svi = this.rawVersionInfo["StringFileInfo"];
+            if (svi != null)
+            {
+                foreach (VersionInfo strings in svi)
+                {
+                    array[arrayIndex++] = new VersionStringTable(this, strings);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets an enumerator that can iterate over the version string tables in the collection.
+        /// </summary>
+        /// <returns>An enumerator that returns <see cref="VersionStringTable"/> objects.</returns>
+        public IEnumerator<VersionStringTable> GetEnumerator()
+        {
+            VersionInfo svi = this.rawVersionInfo["StringFileInfo"];
+            if (svi != null)
+            {
+                foreach (VersionInfo strings in svi)
+                {
+                    yield return new VersionStringTable(this, strings);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets an enumerator that can iterate over the version string tables in the collection.
+        /// </summary>
+        /// <returns>An enumerator that returns <see cref="VersionStringTable"/> objects.</returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/VersionStringTable.cs b/src/dtf/WixToolset.Dtf.Resources/VersionStringTable.cs
new file mode 100644
index 00000000..6aad68c6
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/VersionStringTable.cs
@@ -0,0 +1,231 @@
+// 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.Dtf.Resources
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Reflection;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Represents a string table of a file version resource.
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+    public sealed class VersionStringTable : IDictionary<string, string>
+    {
+        private VersionResource parent;
+        private VersionInfo rawStringVersionInfo;
+
+        internal VersionStringTable(VersionResource parent, VersionInfo rawStringVersionInfo)
+        {
+            this.parent = parent;
+            this.rawStringVersionInfo = rawStringVersionInfo;
+        }
+
+        /// <summary>
+        /// Gets the locale (LCID) of the string table.
+        /// </summary>
+        public int Locale
+        {
+            get
+            {
+                return UInt16.Parse(rawStringVersionInfo.Key.Substring(0, 4), NumberStyles.HexNumber, CultureInfo.InvariantCulture);
+            }
+            set
+            {
+                rawStringVersionInfo.Key = ((ushort) value).ToString("x4", CultureInfo.InvariantCulture) + rawStringVersionInfo.Key.Substring(4, 4);
+                this.parent.dirty = true;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a string value.
+        /// </summary>
+        /// <param name="key">Name of the string.</param>
+        public string this[string key]
+        {
+            get
+            {
+                VersionInfo verValue = this.rawStringVersionInfo[key];
+                if (verValue == null)
+                {
+                    return null;
+                }
+                else
+                {
+                    return Encoding.Unicode.GetString(verValue.Data, 0, verValue.Data.Length - 2);
+                }
+            }
+            set
+            {
+                if (value == null)
+                {
+                    rawStringVersionInfo.Remove(key);
+                }
+                else
+                {
+                    VersionInfo verValue = rawStringVersionInfo[key];
+                    if (verValue == null)
+                    {
+                        verValue = new VersionInfo(key);
+                        verValue.IsString = true;
+                        rawStringVersionInfo.Add(verValue);
+                    }
+                    verValue.Data = new byte[Encoding.Unicode.GetByteCount(value) + 2];
+                    Encoding.Unicode.GetBytes(value, 0, value.Length, verValue.Data, 0);
+                }
+                this.parent.dirty = true;
+            }
+        }
+
+        bool ICollection<KeyValuePair<string, string>>.IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        bool IDictionary<string, string>.TryGetValue(string key, out string value)
+        {
+            value = this[key];
+            return value != null;
+        }
+
+
+        void ICollection<KeyValuePair<string, string>>.Add(KeyValuePair<string, string> item)
+        {
+            this[item.Key] = item.Value;
+        }
+
+        bool ICollection<KeyValuePair<string, string>>.Remove(KeyValuePair<string, string> item)
+        {
+            string value = this[item.Key];
+            if (value == item.Value)
+            {
+                this[item.Key] = null;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        bool ICollection<KeyValuePair<string, string>>.Contains(KeyValuePair<string, string> item)
+        {
+            string value = this[item.Key];
+            if (value == item.Value)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        bool IDictionary<string, string>.ContainsKey(string key)
+        {
+            return this[key] != null;
+        }
+
+        void IDictionary<string, string>.Add(string key, string value)
+        {
+            this[key] = value;
+        }
+
+        bool IDictionary<string, string>.Remove(string key)
+        {
+            if (this[key] != null)
+            {
+                this[key] = null;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Removes all strings from the string table.
+        /// </summary>
+        public void Clear()
+        {
+            this.rawStringVersionInfo.Clear();
+        }
+
+        /// <summary>
+        /// Gets a collection of all the names of the strings in the table.
+        /// </summary>
+        public ICollection<string> Keys
+        {
+            get
+            {
+                List<string> keys = new List<string>(this.rawStringVersionInfo.Count);
+                foreach (VersionInfo verValue in this.rawStringVersionInfo)
+                {
+                    keys.Add(verValue.Key);
+                }
+                return keys;
+            }
+        }
+
+        /// <summary>
+        /// Gets a collection of all the values in the table.
+        /// </summary>
+        public ICollection<string> Values
+        {
+            get
+            {
+                List<string> values = new List<string>(this.rawStringVersionInfo.Count);
+                foreach (VersionInfo verValue in this.rawStringVersionInfo)
+                {
+                    values.Add(Encoding.Unicode.GetString(verValue.Data, 0, verValue.Data.Length - 2));
+                }
+                return values;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of strings in the table.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return this.rawStringVersionInfo.Count;
+            }
+        }
+
+        void ICollection<KeyValuePair<string, string>>.CopyTo(KeyValuePair<string, string>[] array, int index)
+        {
+            foreach (VersionInfo verValue in this.rawStringVersionInfo)
+            {
+                array[index++] = new KeyValuePair<string, string>(verValue.Key, Encoding.Unicode.GetString(verValue.Data, 0, verValue.Data.Length - 2));
+            }
+        }
+
+        /// <summary>
+        /// Gets an enumeration over all strings in the table.
+        /// </summary>
+        /// <returns>Enumeration of string name and value pairs</returns>
+        public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
+        {
+            foreach (VersionInfo verValue in this.rawStringVersionInfo)
+            {
+                yield return new KeyValuePair<string, string>(verValue.Key, Encoding.Unicode.GetString(verValue.Data, 0, verValue.Data.Length - 2));
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
new file mode 100644
index 00000000..b5f5e9a2
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.Resources/WixToolset.Dtf.Resources.csproj
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>WixToolset.Dtf.Resources</RootNamespace>
+    <AssemblyName>WixToolset.Dtf.Resources</AssemblyName>
+    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <Description>Classes for reading and writing resource data in executable files</Description>
+    <CreateDocumentationFile>true</CreateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/AssemblyInfo.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/AssemblyInfo.cs
new file mode 100644
index 00000000..94abf1dc
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/AssemblyInfo.cs
@@ -0,0 +1,6 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Scope = "member", Target = "WixToolset.Dtf.WindowsInstaller.Linq.QTable`1.System.Linq.IQueryable<TRecord>.CreateQuery(System.Linq.Expressions.Expression):System.Linq.IQueryable`1<TElement>")]
+[assembly: SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter", Scope = "member", Target = "WixToolset.Dtf.WindowsInstaller.Linq.QTable`1.System.Linq.IQueryable<TRecord>.Execute(System.Linq.Expressions.Expression):TResult")]
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/Attributes.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/Attributes.cs
new file mode 100644
index 00000000..60008bc8
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/Attributes.cs
@@ -0,0 +1,60 @@
+// 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.Dtf.WindowsInstaller.Linq
+{
+    using System;
+
+    /// <summary>
+    /// Apply to a subclass of QRecord to indicate the name of
+    /// the table the record type is to be used with.
+    /// </summary>
+    /// <remarks>
+    /// If this attribute is not used on a record type, the default
+    /// table name will be derived from the record type name. (An
+    /// optional underscore suffix is stripped.)
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
+    public class DatabaseTableAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new DatabaseTableAttribute for the specified table.
+        /// </summary>
+        /// <param name="table">name of the table associated with the record type</param>
+        public DatabaseTableAttribute(string table)
+        {
+            this.Table = table;
+        }
+
+        /// <summary>
+        /// Gets or sets the table associated with the record type.
+        /// </summary>
+        public string Table { get; set; }
+    }
+
+    /// <summary>
+    /// Apply to a property on a subclass of QRecord to indicate
+    /// the name of the column the property is to be associated with.
+    /// </summary>
+    /// <remarks>
+    /// If this attribute is not used on a property, the default
+    /// column name will be the same as the property name.
+    /// </remarks>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
+    public class DatabaseColumnAttribute : Attribute
+    {
+        /// <summary>
+        /// Creates a new DatabaseColumnAttribute which maps a
+        /// record property to a column.
+        /// </summary>
+        /// <param name="column">name of the column associated with the property</param>
+        public DatabaseColumnAttribute(string column)
+        {
+            this.Column = column;
+        }
+
+        /// <summary>
+        /// Gets or sets the column associated with the record property.
+        /// </summary>
+        public string Column { get; set; }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/Entities.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/Entities.cs
new file mode 100644
index 00000000..1c51b861
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/Entities.cs
@@ -0,0 +1,150 @@
+// 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.Dtf.WindowsInstaller.Linq.Entities
+{
+    // Silence warnings about style and doc-comments
+    #if !CODE_ANALYSIS
+    #pragma warning disable 1591
+    #region Generated code
+
+    public class Component_ : QRecord
+    {
+        public string Component   { get { return this[0]; } set { this[0] = value; } }
+        public string ComponentId { get { return this[1]; } set { this[1] = value; } }
+        public string Directory_  { get { return this[2]; } set { this[2] = value; } }
+        public string Condition   { get { return this[4]; } set { this[4] = value; } }
+        public string KeyPath     { get { return this[5]; } set { this[5] = value; } }
+        public ComponentAttributes Attributes
+        { get { return (ComponentAttributes) this.I(3); } set { this[3] = ((int) value).ToString(); } }
+    }
+
+    public class CreateFolder_ : QRecord
+    {
+        public string Directory_ { get { return this[0]; } set { this[0] = value; } }
+        public string Component_ { get { return this[1]; } set { this[1] = value; } }
+    }
+
+    public class CustomAction_ : QRecord
+    {
+        public string Action { get { return this[0]; } set { this[0] = value; } }
+        public string Source { get { return this[2]; } set { this[2] = value; } }
+        public string Target { get { return this[3]; } set { this[3] = value; } }
+        public CustomActionTypes Type
+        { get { return (CustomActionTypes) this.I(1); } set { this[1] = ((int) value).ToString(); } }
+    }
+
+    public class Directory_ : QRecord
+    {
+        public string Directory        { get { return this[0]; } set { this[0] = value; } }
+        public string Directory_Parent { get { return this[1]; } set { this[1] = value; } }
+        public string DefaultDir       { get { return this[2]; } set { this[2] = value; } }
+    }
+
+    public class DuplicateFile_ : QRecord
+    {
+        public string FileKey    { get { return this[0]; } set { this[0] = value; } }
+        public string Component_ { get { return this[1]; } set { this[1] = value; } }
+        public string File_      { get { return this[2]; } set { this[2] = value; } }
+        public string DestName   { get { return this[4]; } set { this[4] = value; } }
+        public string DestFolder { get { return this[5]; } set { this[5] = value; } }
+    }
+
+    public class Feature_ : QRecord
+    {
+        public string Feature        { get { return this[0];    } set { this[0] = value; } }
+        public string Feature_Parent { get { return this[1];    } set { this[1] = value; } }
+        public string Title          { get { return this[2];    } set { this[2] = value; } }
+        public string Description    { get { return this[3];    } set { this[3] = value; } }
+        public int?   Display        { get { return this.NI(4); } set { this[4] = value.ToString(); } }
+        public int    Level          { get { return this.I(5);  } set { this[5] = value.ToString(); } }
+        public string Directory_     { get { return this[6];    } set { this[6] = value; } }
+        public FeatureAttributes Attributes
+        { get { return (FeatureAttributes) this.I(7); } set { this[7] = ((int) value).ToString(); } }
+    }
+
+    [DatabaseTable("FeatureComponents")]
+    public class FeatureComponent_ : QRecord
+    {
+        public string Feature_   { get { return this[0]; } set { this[0] = value; } }
+        public string Component_ { get { return this[1]; } set { this[1] = value; } }
+    }
+
+    public class File_ : QRecord
+    {
+        public string File       { get { return this[0];   } set { this[0] = value; } }
+        public string Component_ { get { return this[1];   } set { this[1] = value; } }
+        public string FileName   { get { return this[2];   } set { this[2] = value; } }
+        public int    FileSize   { get { return this.I(3); } set { this[3] = value.ToString(); } }
+        public string Version    { get { return this[4];   } set { this[4] = value; } }
+        public string Language   { get { return this[5];   } set { this[5] = value; } }
+        public int    Sequence   { get { return this.I(7); } set { this[7] = value.ToString(); } }
+        public FileAttributes Attributes
+        { get { return (FileAttributes) this.I(6); } set { this[6] = ((int) value).ToString(); } }
+    }
+
+    [DatabaseTable("MsiFileHash")]
+    public class FileHash_ : QRecord
+    {
+        public string File_     { get { return this[0];   } set { this[0] = value; } }
+        public int    Options   { get { return this.I(1); } set { this[1] = value.ToString(); } }
+        public int    HashPart1 { get { return this.I(2); } set { this[2] = value.ToString(); } }
+        public int    HashPart2 { get { return this.I(3); } set { this[3] = value.ToString(); } }
+        public int    HashPart3 { get { return this.I(4); } set { this[4] = value.ToString(); } }
+        public int    HashPart4 { get { return this.I(5); } set { this[5] = value.ToString(); } }
+    }
+
+    [DatabaseTable("InstallExecuteSequence")]
+    public class InstallSequence_ : QRecord
+    {
+        public string Action    { get { return this[0];   } set { this[0] = value; } }
+        public string Condition { get { return this[1];   } set { this[1] = value; } }
+        public int    Sequence  { get { return this.I(2); } set { this[2] = value.ToString(); } }
+    }
+
+    public class LaunchCondition_ : QRecord
+    {
+        public string Condition   { get { return this[0]; } set { this[0] = value; } }
+        public string Description { get { return this[1]; } set { this[1] = value; } }
+    }
+
+    public class Media_ : QRecord
+    {
+        public int    DiskId       { get { return this.I(0); } set { this[0] = value.ToString(); } }
+        public int    LastSequence { get { return this.I(1); } set { this[1] = value.ToString(); } }
+        public string DiskPrompt   { get { return this[2];   } set { this[2] = value; } }
+        public string Cabinet      { get { return this[3];   } set { this[3] = value; } }
+        public string VolumeLabel  { get { return this[4];   } set { this[4] = value; } }
+        public string Source       { get { return this[5];   } set { this[5] = value; } }
+    }
+
+    public class Property_ : QRecord
+    {
+        public string Property { get { return this[0]; } set { this[0] = value; } }
+        public string Value    { get { return this[1]; } set { this[1] = value; } }
+    }
+
+    public class Registry_ : QRecord
+    {
+        public string Registry   { get { return this[0]; } set { this[0] = value; } }
+        public string Key        { get { return this[2]; } set { this[2] = value; } }
+        public string Name       { get { return this[3]; } set { this[3] = value; } }
+        public string Value      { get { return this[4]; } set { this[4] = value; } }
+        public string Component_ { get { return this[5]; } set { this[5] = value; } }
+        public RegistryRoot Root
+        { get { return (RegistryRoot) this.I(1); } set { this[0] = ((int) value).ToString(); } }
+    }
+
+    public class RemoveFile_ : QRecord
+    {
+        public string FileKey     { get { return this[0]; } set { this[0] = value; } }
+        public string Component_  { get { return this[2]; } set { this[2] = value; } }
+        public string FileName    { get { return this[3]; } set { this[3] = value; } }
+        public string DirProperty { get { return this[4]; } set { this[4] = value; } }
+        public RemoveFileModes InstallMode
+        { get { return (RemoveFileModes) this.I(5); } set { this[5] = ((int) value).ToString(); } }
+    }
+
+    #endregion // Generated code
+    #pragma warning restore 1591
+    #endif // !CODE_ANALYSIS
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/QDatabase.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/QDatabase.cs
new file mode 100644
index 00000000..b4de2f60
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/QDatabase.cs
@@ -0,0 +1,214 @@
+// 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.Dtf.WindowsInstaller.Linq
+{
+    using System;
+    using System.IO;
+    using WixToolset.Dtf.WindowsInstaller.Linq.Entities;
+
+    /// <summary>
+    /// Allows any Database instance to be converted into a queryable database.
+    /// </summary>
+    public static class Queryable
+    {
+        /// <summary>
+        /// Converts any Database instance into a queryable database.
+        /// </summary>
+        /// <param name="db"></param>
+        /// <returns>Queryable database instance that operates on the same
+        /// MSI handle.</returns>
+        /// <remarks>
+        /// This extension method is meant for convenient on-the-fly conversion.
+        /// If the existing database instance already happens to be a QDatabase,
+        /// then it is returned unchanged. Otherwise since the new database
+        /// carries the same MSI handle, only one of the instances needs to be
+        /// closed, not both.
+        /// </remarks>
+        public static QDatabase AsQueryable(this Database db)
+        {
+            QDatabase qdb = db as QDatabase;
+            if (qdb == null && db != null)
+            {
+                qdb = new QDatabase(db.Handle, true, db.FilePath, db.OpenMode);
+            }
+            return qdb;
+        }
+    }
+
+    /// <summary>
+    /// Queryable MSI database - extends the base Database class with
+    /// LINQ query functionality along with predefined entity types
+    /// for common tables.
+    /// </summary>
+    public class QDatabase : Database
+    {
+        /// <summary>
+        /// Opens an existing database in read-only mode.
+        /// </summary>
+        /// <param name="filePath">Path to the database file.</param>
+        /// <exception cref="InstallerException">the database could not be created/opened</exception>
+        /// <remarks>
+        /// Because this constructor initiates database access, it cannot be used with a
+        /// running installation.
+        /// <para>The Database object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// The finalizer will close the handle if it is still open, however due to the nondeterministic
+        /// nature of finalization it is best that the handle be closed manually as soon as it is no
+        /// longer needed, as leaving lots of unused handles open can degrade performance.</para>
+        /// </remarks>
+        public QDatabase(string filePath)
+            : base(filePath)
+        {
+        }
+
+        /// <summary>
+        /// Opens an existing database with another database as output.
+        /// </summary>
+        /// <param name="filePath">Path to the database to be read.</param>
+        /// <param name="outputPath">Open mode for the database</param>
+        /// <returns>Database object representing the created or opened database</returns>
+        /// <exception cref="InstallerException">the database could not be created/opened</exception>
+        /// <remarks>
+        /// When a database is opened as the output of another database, the summary information stream
+        /// of the output database is actually a read-only mirror of the original database and thus cannot
+        /// be changed. Additionally, it is not persisted with the database. To create or modify the
+        /// summary information for the output database it must be closed and re-opened.
+        /// <para>The returned Database object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// The finalizer will close the handle if it is still open, however due to the nondeterministic
+        /// nature of finalization it is best that the handle be closed manually as soon as it is no
+        /// longer needed, as leaving lots of unused handles open can degrade performance.</para>
+        /// </remarks>
+        public QDatabase(string filePath, string outputPath)
+            : base(filePath, outputPath)
+        {
+        }
+
+        /// <summary>
+        /// Opens an existing database or creates a new one.
+        /// </summary>
+        /// <param name="filePath">Path to the database file. If an empty string
+        /// is supplied, a temporary database is created that is not persisted.</param>
+        /// <param name="mode">Open mode for the database</param>
+        /// <exception cref="InstallerException">the database could not be created/opened</exception>
+        /// <remarks>
+        /// To make and save changes to a database first open the database in transaction,
+        /// create or, or direct mode. After making the changes, always call the Commit method
+        /// before closing the database handle. The Commit method flushes all buffers.
+        /// <para>Always call the Commit method on a database that has been opened in direct
+        /// mode before closing the database. Failure to do this may corrupt the database.</para>
+        /// <para>Because this constructor initiates database access, it cannot be used with a
+        /// running installation.</para>
+        /// <para>The Database object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// The finalizer will close the handle if it is still open, however due to the nondeterministic
+        /// nature of finalization it is best that the handle be closed manually as soon as it is no
+        /// longer needed, as leaving lots of unused handles open can degrade performance.</para>
+        /// </remarks>
+        public QDatabase(string filePath, DatabaseOpenMode mode)
+            : base(filePath, mode)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new database from an MSI handle.
+        /// </summary>
+        /// <param name="handle">Native MSI database handle.</param>
+        /// <param name="ownsHandle">True if the handle should be closed
+        /// when the database object is disposed</param>
+        /// <param name="filePath">Path of the database file, if known</param>
+        /// <param name="openMode">Mode the handle was originally opened in</param>
+        protected internal QDatabase(
+            IntPtr handle, bool ownsHandle, string filePath, DatabaseOpenMode openMode)
+            : base(handle, ownsHandle, filePath, openMode)
+        {
+        }
+
+        /// <summary>
+        /// Gets or sets a log where all MSI SQL queries are written.
+        /// </summary>
+        /// <remarks>
+        /// The log can be useful for debugging, or simply to watch the LINQ magic in action.
+        /// </remarks>
+        public TextWriter Log { get; set; }
+
+        /// <summary>
+        /// Gets a queryable table from the datbaase.
+        /// </summary>
+        /// <param name="table">name of the table</param>
+        public QTable<QRecord> this[string table]
+        {
+            get
+            {
+                return new QTable<QRecord>(this, table);
+            }
+        }
+
+        #if !CODE_ANALYSIS
+        #region Queryable tables
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<Component_> Components
+        { get { return new QTable<Component_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<CreateFolder_> CreateFolders
+        { get { return new QTable<CreateFolder_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<CustomAction_> CustomActions
+        { get { return new QTable<CustomAction_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<Directory_> Directories
+        { get { return new QTable<Directory_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<DuplicateFile_> DuplicateFiles
+        { get { return new QTable<DuplicateFile_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<Feature_> Features
+        { get { return new QTable<Feature_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<FeatureComponent_> FeatureComponents
+        { get { return new QTable<FeatureComponent_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<File_> Files
+        { get { return new QTable<File_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<FileHash_> FileHashes
+        { get { return new QTable<FileHash_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<InstallSequence_> InstallExecuteSequences
+        { get { return new QTable<InstallSequence_>(this, "InstallExecuteSequence"); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<InstallSequence_> InstallUISequences
+        { get { return new QTable<InstallSequence_>(this, "InstallUISequence"); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<LaunchCondition_> LaunchConditions
+        { get { return new QTable<LaunchCondition_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<Media_> Medias
+        { get { return new QTable<Media_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<Property_> Properties
+        { get { return new QTable<Property_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<Registry_> Registries
+        { get { return new QTable<Registry_>(this); } }
+
+        /// <summary>Queryable standard table with predefined specialized record type.</summary>
+        public QTable<RemoveFile_> RemoveFiles
+        { get { return new QTable<RemoveFile_>(this); } }
+
+        #endregion // Queryable tables
+        #endif // !CODE_ANALYSIS
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/QRecord.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/QRecord.cs
new file mode 100644
index 00000000..4b3145fd
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/QRecord.cs
@@ -0,0 +1,501 @@
+// 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.Dtf.WindowsInstaller.Linq
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Globalization;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Generic record entity for queryable databases,
+    /// and base for strongly-typed entity subclasses.
+    /// </summary>
+    /// <remarks>
+    /// Several predefined specialized subclasses are provided for common
+    /// standard tables. Subclasses for additional standard tables
+    /// or custom tables are not necessary, but they are easy to create
+    /// and make the coding experience much nicer.
+    /// <para>When creating subclasses, the following attributes may be
+    /// useful: <see cref="DatabaseTableAttribute"/>,
+    /// <see cref="DatabaseColumnAttribute"/></para>
+    /// </remarks>
+    public class QRecord
+    {
+        /// <summary>
+        /// Do not call. Use QTable.NewRecord() instead.
+        /// </summary>
+        /// <remarks>
+        /// Subclasses must also provide a public parameterless constructor.
+        /// <para>QRecord constructors are only public due to implementation
+        /// reasons (to satisfy the new() constraint on the QTable generic
+        /// class). They are not intended to be called by user code other than
+        /// a subclass constructor. If the constructor is invoked directly,
+        /// the record instance will not be properly initialized (associated
+        /// with a database table) and calls to methods on the instance
+        /// will throw a NullReferenceException.</para>
+        /// </remarks>
+        /// <seealso cref="QTable&lt;TRecord&gt;.NewRecord()"/>
+        public QRecord()
+        {
+        }
+
+        internal QDatabase Database { get; set; }
+
+        internal TableInfo TableInfo { get; set; }
+
+        internal IList<string> Values { get; set; }
+
+        internal bool Exists { get; set; }
+
+        /// <summary>
+        /// Gets the number of fields in the record.
+        /// </summary>
+        public int FieldCount
+        {
+            get
+            {
+                return this.Values.Count;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a record field.
+        /// </summary>
+        /// <param name="field">column name of the field</param>
+        /// <remarks>
+        /// Setting a field value will automatically update the database.
+        /// </remarks>
+        public string this[string field]
+        {
+            get
+            {
+                if (field == null)
+                {
+                    throw new ArgumentNullException("field");
+                }
+
+                int index = this.TableInfo.Columns.IndexOf(field);
+                if (index < 0)
+                {
+                    throw new ArgumentOutOfRangeException("field");
+                }
+
+                return this[index];
+            }
+
+            set
+            {
+                if (field == null)
+                {
+                    throw new ArgumentNullException("field");
+                }
+
+                this.Update(new string[] { field }, new string[] { value });
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a record field.
+        /// </summary>
+        /// <param name="index">zero-based column index of the field</param>
+        /// <remarks>
+        /// Setting a field value will automatically update the database.
+        /// </remarks>
+        public string this[int index]
+        {
+            get
+            {
+                if (index < 0 || index >= this.FieldCount)
+                {
+                    throw new ArgumentOutOfRangeException("index");
+                }
+
+                return this.Values[index];
+            }
+
+            set
+            {
+                if (index < 0 || index >= this.FieldCount)
+                {
+                    throw new ArgumentOutOfRangeException("index");
+                }
+
+                this.Update(new int[] { index }, new string[] { value });
+            }
+        }
+
+        /// <summary>
+        /// Used by subclasses to get a field as an integer.
+        /// </summary>
+        /// <param name="index">zero-based column index of the field</param>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "I")]
+        protected int I(int index)
+        {
+            string value = this[index];
+            return value.Length > 0 ?
+                Int32.Parse(value, CultureInfo.InvariantCulture) : 0;
+        }
+
+        /// <summary>
+        /// Used by subclasses to get a field as a nullable integer.
+        /// </summary>
+        /// <param name="index">zero-based column index of the field</param>
+        protected int? NI(int index)
+        {
+            string value = this[index];
+            return value.Length > 0 ?
+                new int?(Int32.Parse(value, CultureInfo.InvariantCulture)) : null;
+        }
+
+        /// <summary>
+        /// Dumps all record fields to a string.
+        /// </summary>
+        public override string ToString()
+        {
+            StringBuilder buf = new StringBuilder(this.GetType().Name);
+            buf.Append(" {");
+            for (int i = 0; i < this.FieldCount; i++)
+            {
+                buf.AppendFormat("{0} {1} = {2}",
+                    (i > 0 ? "," : String.Empty),
+                    this.TableInfo.Columns[i].Name,
+                    this[i]);
+            }
+            buf.Append(" }");
+            return buf.ToString();
+        }
+
+        /// <summary>
+        /// Update multiple fields in the record (and the database).
+        /// </summary>
+        /// <param name="fields">column names of fields to update</param>
+        /// <param name="values">new values for each field being updated</param>
+        public void Update(IList<string> fields, IList<string> values)
+        {
+            if (fields == null)
+            {
+                throw new ArgumentNullException("fields");
+            }
+
+            if (values == null)
+            {
+                throw new ArgumentNullException("values");
+            }
+
+            if (fields.Count == 0 || values.Count == 0 ||
+                fields.Count > this.FieldCount ||
+                values.Count != fields.Count)
+            {
+                throw new ArgumentOutOfRangeException("fields");
+            }
+
+            int[] indexes = new int[fields.Count];
+            for (int i = 0; i < indexes.Length; i++)
+            {
+                if (fields[i] == null)
+                {
+                    throw new ArgumentNullException("fields[" + i + "]");
+                }
+
+                indexes[i] = this.TableInfo.Columns.IndexOf(fields[i]);
+
+                if (indexes[i] < 0)
+                {
+                    throw new ArgumentOutOfRangeException("fields[" + i + "]");
+                }
+            }
+
+            this.Update(indexes, values);
+        }
+
+        /// <summary>
+        /// Update multiple fields in the record (and the database).
+        /// </summary>
+        /// <param name="indexes">column indexes of fields to update</param>
+        /// <param name="values">new values for each field being updated</param>
+        /// <remarks>
+        /// The record (primary keys) must already exist in the table.
+        /// <para>Updating primary key fields is not yet implemented; use Delete()
+        /// and Insert() instead.</para>
+        /// </remarks>
+        public void Update(IList<int> indexes, IList<string> values)
+        {
+            if (indexes == null)
+            {
+                throw new ArgumentNullException("indexes");
+            }
+
+            if (values == null)
+            {
+                throw new ArgumentNullException("values");
+            }
+
+            if (indexes.Count == 0 || values.Count == 0 ||
+                indexes.Count > this.FieldCount ||
+                values.Count != indexes.Count)
+            {
+                throw new ArgumentOutOfRangeException("indexes");
+            }
+
+            bool primaryKeyChanged = false;
+            for (int i = 0; i < indexes.Count; i++)
+            {
+                int index = indexes[i];
+                if (index < 0 || index >= this.FieldCount)
+                {
+                    throw new ArgumentOutOfRangeException("index[" + i + "]");
+                }
+
+                ColumnInfo col = this.TableInfo.Columns[index];
+                if (this.TableInfo.PrimaryKeys.Contains(col.Name))
+                {
+                    if (values[i] == null)
+                    {
+                        throw new ArgumentNullException("values[" + i + "]");
+                    }
+
+                    primaryKeyChanged = true;
+                }
+                else if (values[i] == null)
+                {
+                    if (col.IsRequired)
+                    {
+                        throw new ArgumentNullException("values[" + i + "]");
+                    }
+                }
+
+                this.Values[index] = values[i];
+            }
+
+            if (this.Exists)
+            {
+                if (!primaryKeyChanged)
+                {
+                    int updateRecSize = indexes.Count + this.TableInfo.PrimaryKeys.Count;
+                    using (Record updateRec = this.Database.CreateRecord(updateRecSize))
+                    {
+                        StringBuilder s = new StringBuilder("UPDATE `");
+                        s.Append(this.TableInfo.Name);
+                        s.Append("` SET");
+
+                        for (int i = 0; i < indexes.Count; i++)
+                        {
+                            ColumnInfo col = this.TableInfo.Columns[indexes[i]];
+                            if (col.Type == typeof(Stream))
+                            {
+                                throw new NotSupportedException(
+                                    "Cannot update stream columns via QRecord.");
+                            }
+
+                            int index = indexes[i];
+                            s.AppendFormat("{0} `{1}` = ?",
+                                (i > 0 ? "," : String.Empty),
+                                col.Name);
+
+                            if (values[i] != null)
+                            {
+                                updateRec[i + 1] = values[i];
+                            }
+                        }
+
+                        for (int i = 0; i < this.TableInfo.PrimaryKeys.Count; i++)
+                        {
+                            string key = this.TableInfo.PrimaryKeys[i];
+                            s.AppendFormat(" {0} `{1}` = ?", (i == 0 ? "WHERE" : "AND"), key);
+                            int index = this.TableInfo.Columns.IndexOf(key);
+                            updateRec[indexes.Count + i + 1] = this.Values[index];
+
+                        }
+
+                        string updateSql = s.ToString();
+                        TextWriter log = this.Database.Log;
+                        if (log != null)
+                        {
+                            log.WriteLine();
+                            log.WriteLine(updateSql);
+                            for (int field = 1; field <= updateRecSize; field++)
+                            {
+                                log.WriteLine("    ? = " + updateRec.GetString(field));
+                            }
+                        }
+
+                        this.Database.Execute(updateSql, updateRec);
+                    }
+                }
+                else
+                {
+                    throw new NotImplementedException(
+                        "Update() cannot handle changed primary keys yet.");
+                    // TODO:
+                    //   query using old values
+                    //   update values
+                    //   View.Replace
+                }
+            }
+        }
+
+        /// <summary>
+        /// Inserts the record in the database.
+        /// </summary>
+        /// <remarks>
+        /// The record (primary keys) may not already exist in the table.
+        /// <para>Use <see cref="QTable&lt;TRecord&gt;.NewRecord()"/> to get a new 
+        /// record. Prmary keys and all required fields
+        /// must be filled in before insertion.</para>
+        /// </remarks>
+        public void Insert()
+        {
+            this.Insert(false);
+        }
+
+        /// <summary>
+        /// Inserts the record into the table.
+        /// </summary>
+        /// <param name="temporary">true if the record is temporarily
+        /// inserted, to be visible only as long as the database is open</param>
+        /// <remarks>
+        /// The record (primary keys) may not already exist in the table.
+        /// <para>Use <see cref="QTable&lt;TRecord&gt;.NewRecord()"/> to get a new 
+        /// record. Prmary keys and all required fields
+        /// must be filled in before insertion.</para>
+        /// </remarks>
+        public void Insert(bool temporary)
+        {
+            using (Record updateRec = this.Database.CreateRecord(this.FieldCount))
+            {
+                string insertSql = this.TableInfo.SqlInsertString;
+                if (temporary)
+                {
+                    insertSql += " TEMPORARY";
+                }
+
+                TextWriter log = this.Database.Log;
+                if (log != null)
+                {
+                    log.WriteLine();
+                    log.WriteLine(insertSql);
+                }
+
+                for (int index = 0; index < this.FieldCount; index++)
+                {
+                    ColumnInfo col = this.TableInfo.Columns[index];
+                    if (col.Type == typeof(Stream))
+                    {
+                        throw new NotSupportedException(
+                            "Cannot insert stream columns via QRecord.");
+                    }
+
+                    if (this.Values[index] != null)
+                    {
+                        updateRec[index + 1] = this.Values[index];
+                    }
+
+                    if (log != null)
+                    {
+                        log.WriteLine("    ? = " + this.Values[index]);
+                    }
+                }
+
+                this.Database.Execute(insertSql, updateRec);
+                this.Exists = true;
+            }
+        }
+
+        /// <summary>
+        /// Deletes the record from the table if it exists.
+        /// </summary>
+        public void Delete()
+        {
+            using (Record keyRec = this.Database.CreateRecord(this.TableInfo.PrimaryKeys.Count))
+            {
+                StringBuilder s = new StringBuilder("DELETE FROM `");
+                s.Append(this.TableInfo.Name);
+                s.Append("`");
+                for (int i = 0; i < this.TableInfo.PrimaryKeys.Count; i++)
+                {
+                    string key = this.TableInfo.PrimaryKeys[i];
+                    s.AppendFormat(" {0} `{1}` = ?", (i == 0 ? "WHERE" : "AND"), key);
+                    int index = this.TableInfo.Columns.IndexOf(key);
+                    keyRec[i + 1] = this.Values[index];
+                }
+
+                string deleteSql = s.ToString();
+
+                TextWriter log = this.Database.Log;
+                if (log != null)
+                {
+                    log.WriteLine();
+                    log.WriteLine(deleteSql);
+
+                    for (int i = 0; i < this.TableInfo.PrimaryKeys.Count; i++)
+                    {
+                        log.WriteLine("    ? = " + keyRec.GetString(i + 1));
+                    }
+                }
+
+                this.Database.Execute(deleteSql, keyRec);
+                this.Exists = false;
+            }
+        }
+
+        /// <summary>
+        /// Not yet implemented.
+        /// </summary>
+        public void Refresh()
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Not yet implemented.
+        /// </summary>
+        public void Assign()
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Not yet implemented.
+        /// </summary>
+        public bool Merge()
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Not yet implemented.
+        /// </summary>
+        public ICollection<ValidationErrorInfo> Validate()
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Not yet implemented.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix")]
+        public ICollection<ValidationErrorInfo> ValidateNew()
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Not yet implemented.
+        /// </summary>
+        public ICollection<ValidationErrorInfo> ValidateFields()
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        /// Not yet implemented.
+        /// </summary>
+        public ICollection<ValidationErrorInfo> ValidateDelete()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/QTable.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/QTable.cs
new file mode 100644
index 00000000..e0e1c154
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/QTable.cs
@@ -0,0 +1,296 @@
+// 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.Dtf.WindowsInstaller.Linq
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Reflection;
+    using System.Linq;
+    using System.Linq.Expressions;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Represents one table in a LINQ-queryable Database.
+    /// </summary>
+    /// <typeparam name="TRecord">type that represents one record in the table</typeparam>
+    /// <remarks>
+    /// This class is the primary gateway to all LINQ to MSI query functionality.
+    /// <para>The TRecord generic parameter may be the general <see cref="QRecord" />
+    /// class, or a specialized subclass of QRecord.</para>
+    /// </remarks>
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+    public sealed class QTable<TRecord> : IOrderedQueryable<TRecord>, IQueryProvider
+        where TRecord : QRecord, new()
+    {
+        private QDatabase db;
+        private TableInfo tableInfo;
+
+        /// <summary>
+        /// Infers the name of the table this instance will be
+        /// associated with.
+        /// </summary>
+        /// <returns>table name</returns>
+        /// <remarks>
+        /// The table name is retrieved from a DatabaseTableAttribute
+        /// on the record type if it exists; otherwise the name is
+        /// derived from the name of the record type itself.
+        /// (An optional underscore suffix on the record type name is dropped.)
+        /// </remarks>
+        private static string InferTableName()
+        {
+            foreach (DatabaseTableAttribute attr in typeof(TRecord).GetCustomAttributes(
+                typeof(DatabaseTableAttribute), false))
+            {
+                string tableName = attr.Table;
+                if (!String.IsNullOrEmpty(tableName))
+                {
+                    return tableName;
+                }
+            }
+
+            string recordTypeName = typeof(TRecord).Name;
+            if (recordTypeName[recordTypeName.Length - 1] == '_')
+            {
+                return recordTypeName.Substring(0, recordTypeName.Length - 1);
+            }
+            else
+            {
+                return recordTypeName;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new QTable, inferring the table name
+        /// from the name of the record type parameter.
+        /// </summary>
+        /// <param name="db">database that contains the table</param>
+        public QTable(QDatabase db)
+            : this(db, InferTableName())
+        {
+        }
+
+        /// <summary>
+        /// Creates a new QTable with an explicit table name.
+        /// </summary>
+        /// <param name="db">database that contains the table</param>
+        /// <param name="table">name of the table</param>
+        public QTable(QDatabase db, string table)
+        {
+            if (db == null)
+            {
+                throw new ArgumentNullException("db");
+            }
+
+            if (String.IsNullOrEmpty(table))
+            {
+                throw new ArgumentNullException("table");
+            }
+
+            this.db = db;
+            this.tableInfo = db.Tables[table];
+            if (this.tableInfo == null)
+            {
+                throw new ArgumentException(
+                    "Table does not exist in database: " + table);
+            }
+        }
+
+        /// <summary>
+        /// Gets schema information about the table.
+        /// </summary>
+        public TableInfo TableInfo
+        {
+            get
+            {
+                return this.tableInfo;
+            }
+        }
+
+        /// <summary>
+        /// Gets the database this table is associated with.
+        /// </summary>
+        public QDatabase Database
+        {
+            get
+            {
+                return this.db;
+            }
+        }
+
+        /// <summary>
+        /// Enumerates over all records in the table.
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerator<TRecord> GetEnumerator()
+        {
+            string query = this.tableInfo.SqlSelectString;
+
+            TextWriter log = this.db.Log;
+            if (log != null)
+            {
+                log.WriteLine();
+                log.WriteLine(query);
+            }
+
+            using (View view = db.OpenView(query))
+            {
+                view.Execute();
+
+                ColumnCollection columns = this.tableInfo.Columns;
+                int columnCount = columns.Count;
+                bool[] isBinary = new bool[columnCount];
+
+                for (int i = 0; i < isBinary.Length; i++)
+                {
+                    isBinary[i] = columns[i].Type == typeof(System.IO.Stream);
+                }
+
+                foreach (Record rec in view) using (rec)
+                {
+                    string[] values = new string[columnCount];
+                    for (int i = 0; i < values.Length; i++)
+                    {
+                        values[i] = isBinary[i] ? "[Binary Data]" : rec.GetString(i + 1);
+                    }
+
+                    TRecord trec = new TRecord();
+                    trec.Database = this.Database;
+                    trec.TableInfo = this.TableInfo;
+                    trec.Values = values;
+                    trec.Exists = true;
+                    yield return trec;
+                }
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return ((IEnumerable<TRecord>) this).GetEnumerator();
+        }
+
+        IQueryable<TElement> IQueryProvider.CreateQuery<TElement>(Expression expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException("expression");
+            }
+
+            Query<TElement> q = new Query<TElement>(this.Database, expression);
+
+            MethodCallExpression methodCallExpression = (MethodCallExpression) expression;
+            string methodName = methodCallExpression.Method.Name;
+            if (methodName == "Where")
+            {
+                LambdaExpression argumentExpression = (LambdaExpression)
+                    ((UnaryExpression) methodCallExpression.Arguments[1]).Operand;
+                q.BuildQuery(this.TableInfo, argumentExpression);
+            }
+            else if (methodName == "OrderBy")
+            {
+                LambdaExpression argumentExpression = (LambdaExpression)
+                    ((UnaryExpression) methodCallExpression.Arguments[1]).Operand;
+                q.BuildSequence(this.TableInfo, argumentExpression);
+            }
+            else if (methodName == "Select")
+            {
+                LambdaExpression argumentExpression = (LambdaExpression)
+                    ((UnaryExpression) methodCallExpression.Arguments[1]).Operand;
+                q.BuildNullQuery(this.TableInfo, typeof(TRecord), argumentExpression);
+                q.BuildProjection(null, argumentExpression);
+            }
+            else if (methodName == "Join")
+            {
+                ConstantExpression constantExpression = (ConstantExpression)
+                    methodCallExpression.Arguments[1];
+                IQueryable inner = (IQueryable) constantExpression.Value;
+                q.PerformJoin(
+                    this.TableInfo,
+                    typeof(TRecord),
+                    inner,
+                    GetJoinLambda(methodCallExpression.Arguments[2]),
+                    GetJoinLambda(methodCallExpression.Arguments[3]),
+                    GetJoinLambda(methodCallExpression.Arguments[4]));
+            }
+            else
+            {
+                throw new NotSupportedException(
+                    "Query operation not supported: " + methodName);
+            }
+
+            return q;
+        }
+
+        private static LambdaExpression GetJoinLambda(Expression expresion)
+        {
+            UnaryExpression unaryExpression = (UnaryExpression) expresion;
+            return (LambdaExpression) unaryExpression.Operand;
+        }
+
+        IQueryable IQueryProvider.CreateQuery(Expression expression)
+        {
+            return ((IQueryProvider) this).CreateQuery<TRecord>(expression);
+        }
+
+        TResult IQueryProvider.Execute<TResult>(Expression expression)
+        {
+            throw new NotSupportedException(
+                "Direct method calls not supported -- use AsEnumerable() instead.");
+        }
+
+        object IQueryProvider.Execute(Expression expression)
+        {
+            throw new NotSupportedException(
+                "Direct method calls not supported -- use AsEnumerable() instead.");
+        }
+
+        IQueryProvider IQueryable.Provider
+        {
+            get
+            {
+                return this;
+            }
+        }
+
+        Type IQueryable.ElementType
+        {
+            get
+            {
+                return typeof(TRecord);
+            }
+        }
+
+        Expression IQueryable.Expression
+        {
+            get
+            {
+                return Expression.Constant(this);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new record that can be inserted into this table.
+        /// </summary>
+        /// <returns>a record with all fields initialized to null</returns>
+        /// <remarks>
+        /// Primary keys and required fields must be filled in with
+        /// non-null values before the record can be inserted.
+        /// <para>The record is tied to this table in this database;
+        /// it cannot be inserted into another table or database.</para>
+        /// </remarks>
+        public TRecord NewRecord()
+        {
+            TRecord rec = new TRecord();
+            rec.Database = this.Database;
+            rec.TableInfo = this.TableInfo;
+            IList<string> values = new List<string>(this.TableInfo.Columns.Count);
+            for (int i = 0; i < this.TableInfo.Columns.Count; i++)
+            {
+                values.Add(null);
+            }
+            rec.Values = values;
+            return rec;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/Query.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/Query.cs
new file mode 100644
index 00000000..ea58757c
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/Query.cs
@@ -0,0 +1,992 @@
+// 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.Dtf.WindowsInstaller.Linq
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Linq.Expressions;
+    using System.Text;
+    using System.Reflection;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Implements the LINQ to MSI query functionality.
+    /// </summary>
+    /// <typeparam name="T">the result type of the current query --
+    /// either some kind of QRecord, or some projection of record data</typeparam>
+    internal sealed class Query<T> : IOrderedQueryable<T>, IQueryProvider
+    {
+        private QDatabase db;
+        private Expression queryableExpression;
+        private List<TableInfo> tables;
+        private List<Type> recordTypes;
+        private List<string> selectors;
+        private string where;
+        private List<object> whereParameters;
+        private List<TableColumn> orderbyColumns;
+        private List<TableColumn> selectColumns;
+        private List<TableColumn> joinColumns;
+        private List<Delegate> projectionDelegates;
+
+        internal Query(QDatabase db, Expression expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException("expression");
+            }
+
+            this.db = db;
+            this.queryableExpression = expression;
+            this.tables = new List<TableInfo>();
+            this.recordTypes = new List<Type>();
+            this.selectors = new List<string>();
+            this.whereParameters = new List<object>();
+            this.orderbyColumns = new List<TableColumn>();
+            this.selectColumns = new List<TableColumn>();
+            this.joinColumns = new List<TableColumn>();
+            this.projectionDelegates = new List<Delegate>();
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            if (this.selectColumns.Count == 0)
+            {
+                AddAllColumns(this.tables[0], this.selectColumns);                
+            }
+
+            string query = this.CompileQuery();
+            return this.InvokeQuery(query);
+        }
+
+        private string CompileQuery()
+        {
+            bool explicitTables = this.tables.Count > 1;
+
+            StringBuilder queryBuilder = new StringBuilder("SELECT");
+
+            for (int i = 0; i < this.selectColumns.Count; i++)
+            {
+                queryBuilder.AppendFormat(
+                    CultureInfo.InvariantCulture,
+                    (explicitTables ? "{0} `{1}`.`{2}`" : "{0} `{2}`"),
+                    (i > 0 ? "," : String.Empty),
+                    this.selectColumns[i].Table.Name,
+                    this.selectColumns[i].Column.Name);
+            }
+
+            for (int i = 0; i < this.tables.Count; i++)
+            {
+                queryBuilder.AppendFormat(
+                    CultureInfo.InvariantCulture,
+                    "{0} `{1}`",
+                    (i == 0 ? " FROM" : ","),
+                    this.tables[i].Name);
+            }
+
+            bool startedWhere = false;
+            for (int i = 0; i < this.joinColumns.Count - 1; i += 2)
+            {
+                queryBuilder.AppendFormat(
+                    CultureInfo.InvariantCulture,
+                    "{0} `{1}`.`{2}` = `{3}`.`{4}` ",
+                    (i == 0 ? " WHERE" : "AND"),
+                    this.joinColumns[i].Table,
+                    this.joinColumns[i].Column,
+                    this.joinColumns[i + 1].Table,
+                    this.joinColumns[i + 1].Column);
+                startedWhere = true;
+            }
+
+            if (this.where != null)
+            {
+                queryBuilder.Append(startedWhere ? "AND " : " WHERE");
+                queryBuilder.Append(this.where);
+            }
+
+            for (int i = 0; i < this.orderbyColumns.Count; i++)
+            {
+                VerifyOrderByColumn(this.orderbyColumns[i]);
+
+                queryBuilder.AppendFormat(
+                    CultureInfo.InvariantCulture,
+                    (explicitTables ? "{0} `{1}`.`{2}`" : "{0} `{2}`"),
+                    (i == 0 ? " ORDER BY" : ","),
+                    this.orderbyColumns[i].Table.Name,
+                    this.orderbyColumns[i].Column.Name);
+            }
+
+            return queryBuilder.ToString();
+        }
+
+        private static void VerifyOrderByColumn(TableColumn tableColumn)
+        {
+            if (tableColumn.Column.Type != typeof(int) &&
+                tableColumn.Column.Type != typeof(short))
+            {
+                throw new NotSupportedException(
+                    "Cannot orderby column: " + tableColumn.Column.Name +
+                    "; orderby is only supported on integer fields");
+            }
+        }
+
+        private IEnumerator<T> InvokeQuery(string query)
+        {
+            TextWriter log = this.db.Log;
+            if (log != null)
+            {
+                log.WriteLine();
+                log.WriteLine(query);
+            }
+
+            using (View queryView = this.db.OpenView(query))
+            {
+                if (this.whereParameters != null && this.whereParameters.Count > 0)
+                {
+                    using (Record paramsRec = this.db.CreateRecord(this.whereParameters.Count))
+                    {
+                        for (int i = 0; i < this.whereParameters.Count; i++)
+                        {
+                            paramsRec[i + 1] = this.whereParameters[i];
+
+                            if (log != null)
+                            {
+                                log.WriteLine("    ? = " + this.whereParameters[i]);
+                            }
+                        }
+
+                        queryView.Execute(paramsRec);
+                    }
+                }
+                else
+                {
+                    queryView.Execute();
+                }
+
+                foreach (Record resultRec in queryView) using (resultRec)
+                {
+                    yield return this.GetResult(resultRec);
+                }
+            }
+        }
+
+        private T GetResult(Record resultRec)
+        {
+            object[] results = new object[this.tables.Count];
+
+            for (int i = 0; i < this.tables.Count; i++)
+            {
+                string[] values = new string[this.tables[i].Columns.Count];
+                for (int j = 0; j < this.selectColumns.Count; j++)
+                {
+                    TableColumn col = this.selectColumns[j];
+                    if (col.Table.Name == this.tables[i].Name)
+                    {
+                        int index = this.tables[i].Columns.IndexOf(
+                            col.Column.Name);
+                        if (index >= 0)
+                        {
+                            if (col.Column.Type == typeof(Stream))
+                            {
+                                values[index] = "[Binary Data]";
+                            }
+                            else
+                            {
+                                values[index] = resultRec.GetString(j + 1);
+                            }
+                        }
+                    }
+                }
+
+                QRecord result = (QRecord) this.recordTypes[i]
+                    .GetConstructor(Type.EmptyTypes).Invoke(null);
+                result.Database = this.db;
+                result.TableInfo = this.tables[i];
+                result.Values = values;
+                result.Exists = true;
+                results[i] = result;
+            }
+
+            if (this.projectionDelegates.Count > 0)
+            {
+                object resultsProjection = results[0];
+                for (int i = 1; i <= results.Length; i++)
+                {
+                    if (i < results.Length)
+                    {
+                        resultsProjection = this.projectionDelegates[i - 1]
+                            .DynamicInvoke(new object[] { resultsProjection, results[i] });
+                    }
+                    else
+                    {
+                        resultsProjection = this.projectionDelegates[i - 1]
+                            .DynamicInvoke(resultsProjection);
+                    }
+                }
+
+                return (T) resultsProjection;
+            }
+            else
+            {
+                return (T) (object) results[0];
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return ((IEnumerable<T>) this).GetEnumerator();
+        }
+
+        public IQueryable<TElement> CreateQuery<TElement>(Expression expression)
+        {
+            if (expression == null)
+            {
+                throw new ArgumentNullException("expression");
+            }
+
+            Query<TElement> q = new Query<TElement>(this.db, expression);
+            q.tables.AddRange(this.tables);
+            q.recordTypes.AddRange(this.recordTypes);
+            q.selectors.AddRange(this.selectors);
+            q.where = this.where;
+            q.whereParameters.AddRange(this.whereParameters);
+            q.orderbyColumns.AddRange(this.orderbyColumns);
+            q.selectColumns.AddRange(this.selectColumns);
+            q.joinColumns.AddRange(this.joinColumns);
+            q.projectionDelegates.AddRange(this.projectionDelegates);
+
+            MethodCallExpression methodCallExpression = (MethodCallExpression) expression;
+            string methodName = methodCallExpression.Method.Name;
+            if (methodName == "Select")
+            {
+                LambdaExpression argumentExpression = (LambdaExpression)
+                    ((UnaryExpression) methodCallExpression.Arguments[1]).Operand;
+                q.BuildProjection(null, argumentExpression);
+            }
+            else if (methodName == "Where")
+            {
+                LambdaExpression argumentExpression = (LambdaExpression)
+                    ((UnaryExpression) methodCallExpression.Arguments[1]).Operand;
+                q.BuildQuery(null, argumentExpression);
+            }
+            else if (methodName == "ThenBy")
+            {
+                LambdaExpression argumentExpression = (LambdaExpression)
+                    ((UnaryExpression) methodCallExpression.Arguments[1]).Operand;
+                q.BuildSequence(null, argumentExpression);
+            }
+            else if (methodName == "Join")
+            {
+                ConstantExpression constantExpression = (ConstantExpression)
+                    methodCallExpression.Arguments[1];
+                IQueryable inner = (IQueryable) constantExpression.Value;
+                q.PerformJoin(
+                    null,
+                    null,
+                    inner,
+                    GetJoinLambda(methodCallExpression.Arguments[2]),
+                    GetJoinLambda(methodCallExpression.Arguments[3]),
+                    GetJoinLambda(methodCallExpression.Arguments[4]));
+            }
+            else
+            {
+                throw new NotSupportedException(
+                    "Query operation not supported: " + methodName);
+            }
+
+            return q;
+        }
+
+        public IQueryable CreateQuery(Expression expression)
+        {
+            return this.CreateQuery<T>(expression);
+        }
+
+        private static LambdaExpression GetJoinLambda(Expression expresion)
+        {
+            UnaryExpression unaryExpression = (UnaryExpression) expresion;
+            return (LambdaExpression) unaryExpression.Operand;
+        }
+
+        public TResult Execute<TResult>(Expression expression)
+        {
+            throw new NotSupportedException(
+                "Direct method calls not supported -- use AsEnumerable() instead.");
+        }
+
+        object IQueryProvider.Execute(Expression expression)
+        {
+            throw new NotSupportedException(
+                "Direct method calls not supported -- use AsEnumerable() instead.");
+        }
+
+        public IQueryProvider Provider
+        {
+            get
+            {
+                return this;
+            }
+        }
+
+        public Type ElementType
+        {
+            get
+            {
+                return typeof(T);
+            }
+        }
+
+        public Expression Expression
+        {
+            get
+            {
+                return this.queryableExpression;
+            }
+        }
+
+        internal void BuildQuery(TableInfo tableInfo, LambdaExpression expression)
+        {
+            if (tableInfo != null)
+            {
+                this.tables.Add(tableInfo);
+                this.recordTypes.Add(typeof(T));
+                this.selectors.Add(expression.Parameters[0].Name);
+            }
+
+            StringBuilder queryBuilder = new StringBuilder();
+
+            this.ParseQuery(expression.Body, queryBuilder);
+
+            this.where = queryBuilder.ToString();
+        }
+
+        internal void BuildNullQuery(TableInfo tableInfo, Type recordType, LambdaExpression expression)
+        {
+            this.tables.Add(tableInfo);
+            this.recordTypes.Add(recordType);
+            this.selectors.Add(expression.Parameters[0].Name);
+        }
+
+        private void ParseQuery(Expression expression, StringBuilder queryBuilder)
+        {
+            queryBuilder.Append("(");
+
+            BinaryExpression binaryExpression;
+            UnaryExpression unaryExpression;
+            MethodCallExpression methodCallExpression;
+
+            if ((binaryExpression = expression as BinaryExpression) != null)
+            {
+                switch (binaryExpression.NodeType)
+                {
+                    case ExpressionType.AndAlso:
+                        this.ParseQuery(binaryExpression.Left, queryBuilder);
+                        queryBuilder.Append(" AND ");
+                        this.ParseQuery(binaryExpression.Right, queryBuilder);
+                        break;
+
+                    case ExpressionType.OrElse:
+                        this.ParseQuery(binaryExpression.Left, queryBuilder);
+                        queryBuilder.Append(" OR ");
+                        this.ParseQuery(binaryExpression.Right, queryBuilder);
+                        break;
+
+                    case ExpressionType.Equal:
+                    case ExpressionType.NotEqual:
+                    case ExpressionType.GreaterThan:
+                    case ExpressionType.LessThan:
+                    case ExpressionType.GreaterThanOrEqual:
+                    case ExpressionType.LessThanOrEqual:
+                        this.ParseQueryCondition(binaryExpression, queryBuilder);
+                        break;
+
+                    default:
+                        throw new NotSupportedException(
+                                  "Expression type not supported: " + binaryExpression.NodeType );
+                }
+            }
+            else if ((unaryExpression = expression as UnaryExpression) != null)
+            {
+                throw new NotSupportedException(
+                    "Expression type not supported: " + unaryExpression.NodeType);
+            }
+            else if ((methodCallExpression = expression as MethodCallExpression) != null)
+            {
+                throw new NotSupportedException(
+                    "Method call not supported: " + methodCallExpression.Method.Name + "()");
+            }
+            else
+            {
+                throw new NotSupportedException(
+                    "Query filter expression not supported: " + expression);
+            }
+
+            queryBuilder.Append(")");
+        }
+
+        private static ExpressionType OppositeExpression(ExpressionType e)
+        {
+            switch (e)
+            {
+                case ExpressionType.LessThan:
+                    return ExpressionType.GreaterThan;
+                case ExpressionType.LessThanOrEqual:
+                    return ExpressionType.GreaterThanOrEqual;
+                case ExpressionType.GreaterThan:
+                    return ExpressionType.LessThan;
+                case ExpressionType.GreaterThanOrEqual:
+                    return ExpressionType.LessThanOrEqual;
+                default:
+                    return e;
+            }
+        }
+
+        private static bool IsIntegerType(Type t)
+        {
+            return
+                t == typeof(sbyte) ||
+                t == typeof(byte) ||
+                t == typeof(short) ||
+                t == typeof(ushort) ||
+                t == typeof(int) ||
+                t == typeof(uint) ||
+                t == typeof(long) ||
+                t == typeof(ulong);
+        }
+
+        private void ParseQueryCondition(
+            BinaryExpression binaryExpression, StringBuilder queryBuilder)
+        {
+            bool swap;
+            string column = this.GetConditionColumn(binaryExpression, out swap);
+            queryBuilder.Append(column);
+
+            ExpressionType expressionType = binaryExpression.NodeType;
+            if (swap)
+            {
+                expressionType = OppositeExpression(expressionType);
+            }
+
+            LambdaExpression valueExpression = Expression.Lambda(
+                swap ? binaryExpression.Left : binaryExpression.Right);
+            object value = valueExpression.Compile().DynamicInvoke();
+
+            bool valueIsInt = false;
+            if (value != null)
+            {
+                if (IsIntegerType(value.GetType()))
+                {
+                    valueIsInt = true;
+                }
+                else
+                {
+                    value = value.ToString();
+                }
+            }
+
+            switch (expressionType)
+            {
+                case ExpressionType.Equal:
+                    if (value == null)
+                    {
+                        queryBuilder.Append(" IS NULL");
+                    }
+                    else if (valueIsInt)
+                    {
+                        queryBuilder.Append(" = ");
+                        queryBuilder.Append(value);
+                    }
+                    else
+                    {
+                        queryBuilder.Append(" = ?");
+                        this.whereParameters.Add(value);
+                    }
+                    return;
+
+                case ExpressionType.NotEqual:
+                    if (value == null)
+                    {
+                        queryBuilder.Append(" IS NOT NULL");
+                    }
+                    else if (valueIsInt)
+                    {
+                        queryBuilder.Append(" <> ");
+                        queryBuilder.Append(value);
+                    }
+                    else
+                    {
+                        queryBuilder.Append(" <> ?");
+                        this.whereParameters.Add(value);
+                    }
+                    return;
+            }
+
+            if (value == null)
+            {
+                throw new InvalidOperationException(
+                    "A null value was used in a greater-than/less-than operation.");
+            }
+
+            if (!valueIsInt)
+            {
+                throw new NotSupportedException(
+                    "Greater-than/less-than operators not supported on strings.");
+            }
+
+            switch (expressionType)
+            {
+                case ExpressionType.LessThan:
+                    queryBuilder.Append(" < ");
+                    break;
+
+                case ExpressionType.LessThanOrEqual:
+                    queryBuilder.Append(" <= ");
+                    break;
+
+                case ExpressionType.GreaterThan:
+                    queryBuilder.Append(" > ");
+                    break;
+
+                case ExpressionType.GreaterThanOrEqual:
+                    queryBuilder.Append(" >= ");
+                    break;
+                
+                default:
+                    throw new NotSupportedException(
+                        "Unsupported query expression type: " + expressionType);
+            }
+
+            queryBuilder.Append(value);
+        }
+
+        private string GetConditionColumn(
+            BinaryExpression binaryExpression, out bool swap)
+        {
+            MemberExpression memberExpression;
+            MethodCallExpression methodCallExpression;
+
+            if (((memberExpression = binaryExpression.Left as MemberExpression) != null) ||
+                ((binaryExpression.Left.NodeType == ExpressionType.Convert ||
+                  binaryExpression.Left.NodeType == ExpressionType.ConvertChecked) &&
+                 (memberExpression = ((UnaryExpression) binaryExpression.Left).Operand
+                  as MemberExpression) != null))
+            {
+                string column = this.GetConditionColumn(memberExpression);
+                if (column != null)
+                {
+                    swap = false;
+                    return column;
+                }
+            }
+            else if (((memberExpression = binaryExpression.Right as MemberExpression) != null) ||
+                     ((binaryExpression.Right.NodeType == ExpressionType.Convert ||
+                       binaryExpression.Right.NodeType == ExpressionType.ConvertChecked) &&
+                      (memberExpression = ((UnaryExpression) binaryExpression.Right).Operand
+                       as MemberExpression) != null))
+            {
+                string column = this.GetConditionColumn(memberExpression);
+                if (column != null)
+                {
+                    swap = true;
+                    return column;
+                }
+            }
+            else if ((methodCallExpression = binaryExpression.Left as MethodCallExpression) != null)
+            {
+                string column = this.GetConditionColumn(methodCallExpression);
+                if (column != null)
+                {
+                    swap = false;
+                    return column;
+                }
+            }
+            else if ((methodCallExpression = binaryExpression.Right as MethodCallExpression) != null)
+            {
+                string column = this.GetConditionColumn(methodCallExpression);
+                if (column != null)
+                {
+                    swap = true;
+                    return column;
+                }
+            }
+
+            throw new NotSupportedException(
+                "Unsupported binary expression: " + binaryExpression);
+        }
+
+        private string GetConditionColumn(MemberExpression memberExpression)
+        {
+            string columnName = GetColumnName(memberExpression.Member);
+            string selectorName = GetConditionSelectorName(memberExpression.Expression);
+            string tableName = this.GetConditionTable(selectorName, columnName);
+            return this.FormatColumn(tableName, columnName);
+        }
+
+        private string GetConditionColumn(MethodCallExpression methodCallExpression)
+        {
+            LambdaExpression argumentExpression =
+                Expression.Lambda(methodCallExpression.Arguments[0]);
+            string columnName = (string) argumentExpression.Compile().DynamicInvoke();
+            string selectorName = GetConditionSelectorName(methodCallExpression.Object);
+            string tableName = this.GetConditionTable(selectorName, columnName);
+            return this.FormatColumn(tableName, columnName);
+        }
+
+        private static string GetConditionSelectorName(Expression expression)
+        {
+            ParameterExpression parameterExpression;
+            MemberExpression memberExpression;
+            if ((parameterExpression = expression as ParameterExpression) != null)
+            {
+                return parameterExpression.Name;
+            }
+            else if ((memberExpression = expression as MemberExpression) != null)
+            {
+                return memberExpression.Member.Name;
+            }
+            else
+            {
+                throw new NotSupportedException(
+                    "Unsupported conditional selector expression: " + expression);
+            }
+        }
+
+        private string GetConditionTable(string selectorName, string columnName)
+        {
+            string tableName = null;
+
+            for (int i = 0; i < this.tables.Count; i++)
+            {
+                if (this.selectors[i] == selectorName)
+                {
+                    tableName = this.tables[i].Name;
+                    break;
+                }
+            }
+
+            if (tableName == null)
+            {
+                throw new InvalidOperationException(String.Format(CultureInfo.InvariantCulture,
+                    "Conditional expression contains column {0}.{1} " +
+                    "from a table that is not in the query.",
+                    selectorName,
+                    columnName));
+            }
+
+            return tableName;
+        }
+
+        private string FormatColumn(string tableName, string columnName)
+        {
+            if (tableName != null && this.tables.Count > 1)
+            {
+                return String.Format(CultureInfo.InvariantCulture, "`{0}`.`{1}`", tableName, columnName);
+            }
+            else
+            {
+                return String.Format(CultureInfo.InvariantCulture, "`{0}`", columnName);
+            }
+        }
+
+        private static string GetColumnName(MemberInfo memberInfo)
+        {
+            foreach (var attr in memberInfo.GetCustomAttributes(
+                typeof(DatabaseColumnAttribute), false))
+            {
+                return ((DatabaseColumnAttribute) attr).Column;
+            }
+
+            return memberInfo.Name;
+        }
+
+        internal void BuildProjection(TableInfo tableInfo, LambdaExpression expression)
+        {
+            if (tableInfo != null)
+            {
+                this.tables.Add(tableInfo);
+                this.recordTypes.Add(typeof(T));
+                this.selectors.Add(expression.Parameters[0].Name);
+            }
+
+            this.FindColumns(expression, this.selectColumns);
+            this.projectionDelegates.Add(expression.Compile());
+        }
+
+        internal void BuildSequence(TableInfo tableInfo, LambdaExpression expression)
+        {
+            if (tableInfo != null)
+            {
+                this.tables.Add(tableInfo);
+                this.recordTypes.Add(typeof(T));
+                this.selectors.Add(expression.Parameters[0].Name);
+            }
+
+            this.FindColumns(expression.Body, this.orderbyColumns);
+        }
+
+        private static void AddAllColumns(TableInfo tableInfo, IList<TableColumn> columnList)
+        {
+            foreach (ColumnInfo column in tableInfo.Columns)
+            {
+                columnList.Add(new TableColumn(tableInfo, column));
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        private void FindColumns(Expression expression, IList<TableColumn> columnList)
+        {
+            if (expression is ParameterExpression)
+            {
+                ParameterExpression e = expression as ParameterExpression;
+                string selector = e.Name;
+                for (int i = 0; i < this.tables.Count; i++)
+                {
+                    if (this.selectors[i] == selector)
+                    {
+                        AddAllColumns(this.tables[i], columnList);
+                        break;
+                    }
+                }
+            }
+            else if (expression.NodeType == ExpressionType.MemberAccess)
+            {
+                this.FindColumns(expression as MemberExpression, columnList);
+            }
+            else if (expression is MethodCallExpression)
+            {
+                this.FindColumns(expression as MethodCallExpression, columnList);
+            }
+            else if (expression is BinaryExpression)
+            {
+                BinaryExpression e = expression as BinaryExpression;
+                this.FindColumns(e.Left, columnList);
+                this.FindColumns(e.Right, columnList);
+            }
+            else if (expression is UnaryExpression)
+            {
+                UnaryExpression e = expression as UnaryExpression;
+                this.FindColumns(e.Operand, columnList);
+            }
+            else if (expression is ConditionalExpression)
+            {
+                ConditionalExpression e = expression as ConditionalExpression;
+                this.FindColumns(e.Test, columnList);
+                this.FindColumns(e.IfTrue, columnList);
+                this.FindColumns(e.IfFalse, columnList);
+            }
+            else if (expression is InvocationExpression)
+            {
+                InvocationExpression e = expression as InvocationExpression;
+                this.FindColumns(e.Expression, columnList);
+                this.FindColumns(e.Arguments, columnList);
+            }
+            else if (expression is LambdaExpression)
+            {
+                LambdaExpression e = expression as LambdaExpression;
+                this.FindColumns(e.Body, columnList);
+            }
+            else if (expression is ListInitExpression)
+            {
+                ListInitExpression e = expression as ListInitExpression;
+                this.FindColumns(e.NewExpression, columnList);
+                foreach (ElementInit ei in e.Initializers)
+                {
+                    this.FindColumns(ei.Arguments, columnList);
+                }
+            }
+            else if (expression is MemberInitExpression)
+            {
+                MemberInitExpression e = expression as MemberInitExpression;
+                this.FindColumns(e.NewExpression, columnList);
+                foreach (MemberAssignment b in e.Bindings)
+                {
+                    this.FindColumns(b.Expression, columnList);
+                }
+            }
+            else if (expression is NewExpression)
+            {
+                NewExpression e = expression as NewExpression;
+                this.FindColumns(e.Arguments, columnList);
+            }
+            else if (expression is NewArrayExpression)
+            {
+                NewArrayExpression e = expression as NewArrayExpression;
+                this.FindColumns(e.Expressions, columnList);
+            }
+            else if (expression is TypeBinaryExpression)
+            {
+                TypeBinaryExpression e = expression as TypeBinaryExpression;
+                this.FindColumns(e.Expression, columnList);
+            }
+        }
+
+        private void FindColumns(IEnumerable<Expression> expressions, IList<TableColumn> columnList)
+        {
+            foreach (Expression expression in expressions)
+            {
+                this.FindColumns(expression, columnList);
+            }
+        }
+
+        private void FindColumns(MemberExpression memberExpression, IList<TableColumn> columnList)
+        {
+            string selector = null;
+            MemberExpression objectMemberExpression;
+            ParameterExpression objectParameterExpression;
+            if ((objectParameterExpression = memberExpression.Expression as
+                ParameterExpression) != null)
+            {
+                selector = objectParameterExpression.Name;
+            }
+            else if ((objectMemberExpression = memberExpression.Expression as
+                MemberExpression) != null)
+            {
+                selector = objectMemberExpression.Member.Name;
+            }
+
+            if (selector != null)
+            {
+                for (int i = 0; i < this.tables.Count; i++)
+                {
+                    if (this.selectors[i] == selector)
+                    {
+                        string columnName = GetColumnName(memberExpression.Member);
+                        ColumnInfo column = this.tables[i].Columns[columnName];
+                        columnList.Add(new TableColumn(this.tables[i], column));
+                        break;
+                    }
+                }
+            }
+
+            selector = memberExpression.Member.Name;
+            for (int i = 0; i < this.tables.Count; i++)
+            {
+                if (this.selectors[i] == selector)
+                {
+                    AddAllColumns(this.tables[i], columnList);
+                    break;
+                }
+            }
+        }
+
+        private void FindColumns(MethodCallExpression methodCallExpression, IList<TableColumn> columnList)
+        {
+            if (methodCallExpression.Method.Name == "get_Item" &&
+                methodCallExpression.Arguments.Count == 1 &&
+                methodCallExpression.Arguments[0].Type == typeof(string))
+            {
+                string selector = null;
+                MemberExpression objectMemberExpression;
+                ParameterExpression objectParameterExpression;
+                if ((objectParameterExpression = methodCallExpression.Object as ParameterExpression) != null)
+                {
+                    selector = objectParameterExpression.Name;
+                }
+                else if ((objectMemberExpression = methodCallExpression.Object as MemberExpression) != null)
+                {
+                    selector = objectMemberExpression.Member.Name;
+                }
+
+                if (selector != null)
+                {
+                    for (int i = 0; i < this.tables.Count; i++)
+                    {
+                        if (this.selectors[i] == selector)
+                        {
+                            LambdaExpression argumentExpression =
+                                Expression.Lambda(methodCallExpression.Arguments[0]);
+                            string columnName = (string)
+                                argumentExpression.Compile().DynamicInvoke();
+                            ColumnInfo column = this.tables[i].Columns[columnName];
+                            columnList.Add(new TableColumn(this.tables[i], column));
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (methodCallExpression.Object != null && methodCallExpression.Object.NodeType != ExpressionType.Parameter)
+            {
+                this.FindColumns(methodCallExpression.Object, columnList);
+            }
+        }
+
+        internal void PerformJoin(
+            TableInfo tableInfo,
+            Type recordType,
+            IQueryable joinTable,
+            LambdaExpression outerKeySelector,
+            LambdaExpression innerKeySelector,
+            LambdaExpression resultSelector)
+        {
+            if (joinTable == null)
+            {
+                throw new ArgumentNullException("joinTable");
+            }
+
+            if (tableInfo != null)
+            {
+                this.tables.Add(tableInfo);
+                this.recordTypes.Add(recordType);
+                this.selectors.Add(outerKeySelector.Parameters[0].Name);
+            }
+
+            PropertyInfo tableInfoProp = joinTable.GetType().GetProperty("TableInfo");
+            if (tableInfoProp == null)
+            {
+                throw new NotSupportedException(
+                    "Cannot join with object: " + joinTable.GetType().Name +
+                    "; join is only supported on another QTable.");
+            }
+
+            TableInfo joinTableInfo = (TableInfo) tableInfoProp.GetValue(joinTable, null);
+            if (joinTableInfo == null)
+            {
+                throw new InvalidOperationException("Missing join table info.");
+            }
+
+            this.tables.Add(joinTableInfo);
+            this.recordTypes.Add(joinTable.ElementType);
+            this.selectors.Add(innerKeySelector.Parameters[0].Name);
+            this.projectionDelegates.Add(resultSelector.Compile());
+
+            int joinColumnCount = this.joinColumns.Count;
+            this.FindColumns(outerKeySelector.Body, this.joinColumns);
+            if (this.joinColumns.Count > joinColumnCount + 1)
+            {
+                throw new NotSupportedException("Join operations involving " +
+                  "multiple columns are not supported.");
+            }
+            else if (this.joinColumns.Count != joinColumnCount + 1)
+            {
+                throw new InvalidOperationException("Bad outer key selector for join.");
+            }
+
+            this.FindColumns(innerKeySelector.Body, this.joinColumns);
+            if (this.joinColumns.Count > joinColumnCount + 2)
+            {
+                throw new NotSupportedException("Join operations involving " +
+                  "multiple columns not are supported.");
+            }
+            if (this.joinColumns.Count != joinColumnCount + 2)
+            {
+                throw new InvalidOperationException("Bad inner key selector for join.");
+            }
+        }
+    }
+
+    internal class TableColumn
+    {
+        public TableColumn(TableInfo table, ColumnInfo column)
+        {
+            this.Table = table;
+            this.Column = column;
+        }
+
+        public TableInfo Table { get; set; }
+        public ColumnInfo Column { get; set; }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
new file mode 100644
index 00000000..b4587071
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Linq/WixToolset.Dtf.WindowsInstaller.Linq.csproj
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>WixToolset.Dtf.WindowsInstaller.Linq</RootNamespace>
+    <AssemblyName>WixToolset.Dtf.WindowsInstaller.Linq</AssemblyName>
+    <TargetFrameworks>netstandard2.0;net35</TargetFrameworks>
+    <Description>LINQ extensions for Windows Installer classes</Description>
+    <CreateDocumentationFile>true</CreateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/InstallPackage.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/InstallPackage.cs
new file mode 100644
index 00000000..276732b7
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/InstallPackage.cs
@@ -0,0 +1,1169 @@
+// 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.Dtf.WindowsInstaller.Package
+{
+using System;
+using System.IO;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Text.RegularExpressions;
+using WixToolset.Dtf.Compression;
+using WixToolset.Dtf.Compression.Cab;
+
+/// <summary>
+/// Handles status messages generated when operations are performed on an
+/// <see cref="InstallPackage"/> or <see cref="PatchPackage"/>.
+/// </summary>
+/// <example>
+/// <c>installPackage.Message += new InstallPackageMessageHandler(Console.WriteLine);</c>
+/// </example>
+public delegate void InstallPackageMessageHandler(string format, params object[] args);
+
+/// <summary>
+/// Provides access to powerful build, maintenance, and analysis operations on an
+/// installation package (.MSI or .MSM).
+/// </summary>
+public class InstallPackage : Database
+{
+    private string cabName;
+    private string cabMsg;
+
+    /// <summary>
+    /// Creates a new InstallPackage object.  The file source directory and working
+    /// directory are the same as the location as the package file.
+    /// </summary>
+    /// <param name="packagePath">Path to the install package to be created or opened</param>
+    /// <param name="openMode">Open mode for the database</param>
+    public InstallPackage(string packagePath, DatabaseOpenMode openMode)
+        : this(packagePath, openMode, null, null)
+    {
+    }
+    /// <summary>
+    /// Creates a new InstallPackage object, specifying an alternate file source
+    /// directory and/or working directory.
+    /// </summary>
+    /// <param name="packagePath">Path to the install package to be created or opened</param>
+    /// <param name="openMode">Open mode for the database</param>
+    /// <param name="sourceDir">Location to obtain source files and cabinets when extracting
+    /// or updating files in the working directory. This is often the location of an original
+    /// copy of the package that is not meant to be modified. If this parameter is null, it
+    /// defaults to the directory of <paramref name="packagePath"/>.</param>
+    /// <param name="workingDir">Location where files will be extracted to/updated from. Also
+    /// the location where a temporary folder is created during some operations. If this
+    /// parameter is null, it defaults to the directory of <paramref name="packagePath"/>.</param>
+    /// <remarks>If the source location is different than the working directory, then
+    /// no files will be modified at the source location.
+    /// </remarks>
+    public InstallPackage(string packagePath, DatabaseOpenMode openMode,
+        string sourceDir, string workingDir) : base(packagePath, openMode)
+    {
+        this.sourceDir  = (sourceDir  != null ? sourceDir  : Path.GetDirectoryName(packagePath));
+        this.workingDir = (workingDir != null ? workingDir : Path.GetDirectoryName(packagePath));
+        this.compressionLevel = CompressionLevel.Normal;
+
+        this.DeleteOnClose(this.TempDirectory);
+    }
+
+    /// <summary>
+    /// Handle this event to receive status messages when operations are performed
+    /// on the install package.
+    /// </summary>
+    /// <example>
+    /// <c>installPackage.Message += new InstallPackageMessageHandler(Console.WriteLine);</c>
+    /// </example>
+    public event InstallPackageMessageHandler Message;
+
+    /// <summary>
+    /// Sends a message to the <see cref="Message"/> event-handler.
+    /// </summary>
+    /// <param name="format">Message string, containing 0 or more format items</param>
+    /// <param name="args">Items to be formatted</param>
+    protected void LogMessage(string format, params object[] args)
+    {
+        if(this.Message != null)
+        {
+            this.Message(format, args);
+        }
+    }
+
+    /// <summary>
+    /// Gets or sets the location to obtain source files and cabinets when
+    /// extracting or updating files in the working directory. This is often
+    /// the location of an original copy of the package that is not meant
+    /// to be modified.
+    /// </summary>
+    public string SourceDirectory
+    {
+        get { return this.sourceDir; }
+        set { this.sourceDir = value; }
+    }
+    private string sourceDir;
+
+    /// <summary>
+    /// Gets or sets the location where files will be extracted to/updated from. Also
+    /// the location where a temporary folder is created during some operations.
+    /// </summary>
+    public string WorkingDirectory
+    {
+        get { return this.workingDir; }
+        set { this.workingDir = value; }
+    }
+    private string workingDir;
+
+    private const string TEMP_DIR_NAME = "WITEMP";
+
+    private string TempDirectory
+    {
+        get { return Path.Combine(this.WorkingDirectory, TEMP_DIR_NAME); }
+    }
+
+    /// <summary>
+    /// Gets the list of file keys that have the specified long file name.
+    /// </summary>
+    /// <param name="longFileName">File name to search for (case-insensitive)</param>
+    /// <returns>Array of file keys, or a 0-length array if none are found</returns>
+    [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase")]
+    public string[] FindFiles(string longFileName)
+    {
+        longFileName = longFileName.ToLowerInvariant();
+        ArrayList fileList = new ArrayList();
+        foreach(KeyValuePair<string, InstallPath> entry in this.Files)
+        {
+            if(((InstallPath) entry.Value).TargetName.ToLowerInvariant()
+               == longFileName)
+            {
+                fileList.Add(entry.Key);
+            }
+        }
+        return (string[]) fileList.ToArray(typeof(string));
+    }
+
+    /// <summary>
+    /// Gets the list of file keys whose long file names match a specified
+    /// regular-expression search pattern.
+    /// </summary>
+    /// <param name="pattern">Regular expression search pattern</param>
+    /// <returns>Array of file keys, or a 0-length array if none are found</returns>
+    public string[] FindFiles(Regex pattern)
+    {
+        ArrayList fileList = new ArrayList();
+        foreach (KeyValuePair<string, InstallPath> entry in this.Files)
+        {
+            if(pattern.IsMatch(((InstallPath) entry.Value).TargetName))
+            {
+                fileList.Add(entry.Key);
+            }
+        }
+        return (string[]) fileList.ToArray(typeof(string));
+    }
+
+    /// <summary>
+    /// Extracts all files to the <see cref="WorkingDirectory"/>. The files are extracted
+    /// to the relative directory matching their <see cref="InstallPath.SourcePath"/>.
+    /// </summary>
+    /// <remarks>If any files have the uncompressed attribute, they will be copied
+    /// from the <see cref="SourceDirectory"/>.</remarks>
+    public void ExtractFiles()
+    {
+        this.ExtractFiles(null);
+    }
+    /// <summary>
+    /// Extracts a specified list of files to the <see cref="WorkingDirectory"/>. The files
+    /// are extracted to the relative directory matching their <see cref="InstallPath.SourcePath"/>.
+    /// </summary>
+    /// <param name="fileKeys">List of file key strings to extract</param>
+    /// <remarks>If any files have the uncompressed attribute, they will be copied
+    /// from the <see cref="SourceDirectory"/>.</remarks>
+    public void ExtractFiles(ICollection<string> fileKeys)
+    {
+        this.ProcessFilesByMediaDisk(fileKeys,
+            new ProcessFilesOnOneMediaDiskHandler(this.ExtractFilesOnOneMediaDisk));
+    }
+
+    private bool IsMergeModule()
+    {
+        return this.CountRows("Media", "`LastSequence` >= 0") == 0 &&
+            this.CountRows("_Streams", "`Name` = 'MergeModule.CABinet'") != 0;
+    }
+
+    private delegate void ProcessFilesOnOneMediaDiskHandler(string mediaCab,
+        InstallPathMap compressedFileMap, InstallPathMap uncompressedFileMap);
+
+    private void ProcessFilesByMediaDisk(ICollection<string> fileKeys,
+        ProcessFilesOnOneMediaDiskHandler diskHandler)
+    {
+        if(this.IsMergeModule())
+        {
+            InstallPathMap files = new InstallPathMap();
+            foreach(string fileKey in this.Files.Keys)
+            {
+                if(fileKeys == null || fileKeys.Contains(fileKey))
+                {
+                    files[fileKey] = this.Files[fileKey];
+                }
+            }
+            diskHandler("#MergeModule.CABinet", files, new InstallPathMap());
+        }
+        else
+        {
+            bool defaultCompressed = ((this.SummaryInfo.WordCount & 0x2) != 0);
+
+            View fileView = null, mediaView = null;
+            Record fileRec = null;
+            try
+            {
+                fileView = this.OpenView("SELECT `File`, `Attributes`, `Sequence` " +
+                    "FROM `File` ORDER BY `Sequence`");
+                mediaView = this.OpenView("SELECT `DiskId`, `LastSequence`, `Cabinet` " +
+                    "FROM `Media` ORDER BY `DiskId`");
+                fileView.Execute();
+                mediaView.Execute();
+
+                int currentMediaDiskId = -1;
+                int currentMediaMaxSequence = -1;
+                string currentMediaCab = null;
+                InstallPathMap compressedFileMap = new InstallPathMap();
+                InstallPathMap uncompressedFileMap = new InstallPathMap();
+
+                while((fileRec = fileView.Fetch()) != null)
+                {
+                    string fileKey = (string) fileRec[1];
+
+                    if(fileKeys == null || fileKeys.Contains(fileKey))
+                    {
+                        int fileAttributes = fileRec.GetInteger(2);
+                        int fileSequence = fileRec.GetInteger(3);
+
+                        InstallPath fileInstallPath = this.Files[fileKey];
+                        if(fileInstallPath == null)
+                        {
+                            this.LogMessage("Could not get install path for source file: {0}", fileKey);
+                            throw new InstallerException("Could not get install path for source file: " + fileKey);
+                        }
+
+                        if(fileSequence > currentMediaMaxSequence)
+                        {
+                            if(currentMediaDiskId != -1)
+                            {
+                                diskHandler(currentMediaCab,
+                                    compressedFileMap, uncompressedFileMap);
+                                compressedFileMap.Clear();
+                                uncompressedFileMap.Clear();
+                            }
+
+                            while(fileSequence > currentMediaMaxSequence)
+                            {
+                                Record mediaRec = mediaView.Fetch();
+                                if(mediaRec == null)
+                                {
+                                    currentMediaDiskId = -1;
+                                    break;
+                                }
+                                using(mediaRec)
+                                {
+                                    currentMediaDiskId = mediaRec.GetInteger(1);
+                                    currentMediaMaxSequence = mediaRec.GetInteger(2);
+                                    currentMediaCab = (string) mediaRec[3];
+                                }
+                            }
+                            if(fileSequence > currentMediaMaxSequence) break;
+                        }
+
+                        if((fileAttributes & (int) WixToolset.Dtf.WindowsInstaller.FileAttributes.Compressed) != 0)
+                        {
+                            compressedFileMap[fileKey] = fileInstallPath;
+                        }
+                        else if ((fileAttributes & (int) WixToolset.Dtf.WindowsInstaller.FileAttributes.NonCompressed) != 0)
+                        {
+                            // Non-compressed files are located
+                            // in the same directory as the MSI, without any path.
+                            uncompressedFileMap[fileKey] = new InstallPath(fileInstallPath.SourceName);
+                        }
+                        else if(defaultCompressed)
+                        {
+                            compressedFileMap[fileKey] = fileInstallPath;
+                        }
+                        else
+                        {
+                            uncompressedFileMap[fileKey] = fileInstallPath;
+                        }
+                    }
+                    fileRec.Close();
+                    fileRec = null;
+                }
+                if(currentMediaDiskId != -1)
+                {
+                    diskHandler(currentMediaCab,
+                        compressedFileMap, uncompressedFileMap);
+                }
+            }
+            finally
+            {
+                if (fileRec != null) fileRec.Close();
+                if (fileView != null) fileView.Close();
+                if (mediaView != null) mediaView.Close();
+            }
+        }
+    }
+
+    [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase")]
+    private void ExtractFilesOnOneMediaDisk(string mediaCab,
+        InstallPathMap compressedFileMap, InstallPathMap uncompressedFileMap)
+    {
+        if(compressedFileMap.Count > 0)
+        {
+            string cabFile = null;
+            if(mediaCab.StartsWith("#", StringComparison.Ordinal))
+            {
+                mediaCab = mediaCab.Substring(1);
+
+                using(View streamView = this.OpenView("SELECT `Name`, `Data` FROM `_Streams` " +
+                      "WHERE `Name` = '{0}'", mediaCab))
+                {
+                    streamView.Execute();
+                    Record streamRec = streamView.Fetch();
+                    if(streamRec == null)
+                    {
+                        this.LogMessage("Stream not found: {0}", mediaCab);
+                        throw new InstallerException("Stream not found: " + mediaCab);
+                    }
+                    using(streamRec)
+                    {
+                        this.LogMessage("extract cab {0}", mediaCab);
+                        Directory.CreateDirectory(this.TempDirectory);
+                        cabFile = Path.Combine(this.TempDirectory,
+                            Path.GetFileNameWithoutExtension(mediaCab) + ".cab");
+                        streamRec.GetStream("Data", cabFile);
+                    }
+                }
+            }
+            else
+            {
+                cabFile = Path.Combine(this.SourceDirectory, mediaCab);
+            }
+
+            this.cabName = mediaCab;
+            this.cabMsg = "extract {0}\\{1} {2}";
+            new CabInfo(cabFile).UnpackFileSet(compressedFileMap.SourcePaths, this.WorkingDirectory,
+                this.CabinetProgress);
+            ClearReadOnlyAttribute(this.WorkingDirectory, compressedFileMap.Values);
+        }
+        foreach(InstallPath fileInstallPath in uncompressedFileMap.Values)
+        {
+            string sourcePath = Path.Combine(this.SourceDirectory, fileInstallPath.SourcePath);
+            string extractPath = Path.Combine(this.WorkingDirectory, fileInstallPath.SourcePath);
+            if(Path.GetFullPath(sourcePath).ToLowerInvariant() !=
+                Path.GetFullPath(extractPath).ToLowerInvariant())
+            {
+                if(!File.Exists(sourcePath))
+                {
+                    this.LogMessage("Error: Uncompressed file not found: {0}", sourcePath);
+                    throw new FileNotFoundException("Uncompressed file not found.", sourcePath);
+                }
+                else
+                {
+                    this.LogMessage("copy {0} {1}", sourcePath, extractPath);
+                    Directory.CreateDirectory(Path.GetDirectoryName(extractPath));
+                    File.Copy(sourcePath, extractPath, true);
+                }
+            }
+            else
+            {
+                if(!File.Exists(extractPath))
+                {
+                    this.LogMessage("Error: Uncompressed file not found: {0}", extractPath);
+                    throw new FileNotFoundException("Uncompressed file not found.", extractPath);
+                }
+            }
+        }
+    }
+
+    private void CabinetProgress(object sender, ArchiveProgressEventArgs e)
+    {
+        switch(e.ProgressType)
+        {
+            case ArchiveProgressType.StartFile:
+            {
+                string filePath = e.CurrentFileName;
+                if(this.filePathMap != null)
+                {
+                    InstallPath fileInstallPath = this.Files[e.CurrentFileName];
+                    if(fileInstallPath != null)
+                    {
+                        filePath = fileInstallPath.SourcePath;
+                    }
+                }
+                this.LogMessage(this.cabMsg, this.cabName, e.CurrentFileName,
+                    Path.Combine(this.WorkingDirectory, filePath));
+            }
+            break;
+        }
+    }
+
+    /// <summary>
+    /// Updates the install package with new files from the <see cref="WorkingDirectory"/>.  The
+    /// files must be in the relative directory matching their <see cref="InstallPath.SourcePath"/>.
+    /// This method re-compresses and packages the files if necessary, and also updates the
+    /// following data: File.FileSize, File.Version, File.Language, MsiFileHash.HashPart*
+    /// </summary>
+    /// <remarks>
+    /// The cabinet compression level used during re-cabbing can be configured with the
+    /// <see cref="CompressionLevel"/> property.
+    /// </remarks>
+    public void UpdateFiles()
+    {
+        this.UpdateFiles(null);
+    }
+    /// <summary>
+    /// Updates the install package with new files from the <see cref="WorkingDirectory"/>.  The
+    /// files must be in the relative directory matching their <see cref="InstallPath.SourcePath"/>.
+    /// This method re-compresses and packages the files if necessary, and also updates the
+    /// following data: File.FileSize, File.Version, File.Language, MsiFileHash.HashPart?.
+    /// </summary>
+    /// <param name="fileKeys">List of file key strings to update</param>
+    /// <remarks>
+    /// This method does not change the media structure of the package, so it may require extracting
+    /// and re-compressing a large cabinet just to update one file.
+    /// <p>The cabinet compression level used during re-cabbing can be configured with the
+    /// <see cref="CompressionLevel"/> property.</p>
+    /// </remarks>
+    public void UpdateFiles(ICollection<string> fileKeys)
+    {
+        this.ProcessFilesByMediaDisk(fileKeys,
+            new ProcessFilesOnOneMediaDiskHandler(this.UpdateFilesOnOneMediaDisk));
+    }
+
+    private void UpdateFilesOnOneMediaDisk(string mediaCab,
+        InstallPathMap compressedFileMap, InstallPathMap uncompressedFileMap)
+    {
+        if(compressedFileMap.Count > 0)
+        {
+            string cabFile = null;
+            bool cabFileIsTemp = false;
+            if(mediaCab.StartsWith("#", StringComparison.Ordinal))
+            {
+                cabFileIsTemp = true;
+                mediaCab = mediaCab.Substring(1);
+
+                using(View streamView = this.OpenView("SELECT `Name`, `Data` FROM `_Streams` " +
+                      "WHERE `Name` = '{0}'", mediaCab))
+                {
+                    streamView.Execute();
+                    Record streamRec = streamView.Fetch();
+                    if(streamRec == null)
+                    {
+                        this.LogMessage("Stream not found: {0}", mediaCab);
+                        throw new InstallerException("Stream not found: " + mediaCab);
+                    }
+                    using(streamRec)
+                    {
+                        this.LogMessage("extract cab {0}", mediaCab);
+                        Directory.CreateDirectory(this.TempDirectory);
+                        cabFile = Path.Combine(this.TempDirectory,
+                            Path.GetFileNameWithoutExtension(mediaCab) + ".cab");
+                        streamRec.GetStream("Data", cabFile);
+                    }
+                }
+            }
+            else
+            {
+                cabFile = Path.Combine(this.SourceDirectory, mediaCab);
+            }
+
+            CabInfo cab = new CabInfo(cabFile);
+            ArrayList fileKeyList = new ArrayList();
+            foreach (CabFileInfo fileInCab in cab.GetFiles())
+            {
+                string fileKey = fileInCab.Name;
+                if(this.Files[fileKey] != null)
+                {
+                    fileKeyList.Add(fileKey);
+                }
+            }
+            string[] fileKeys = (string[]) fileKeyList.ToArray(typeof(string));
+
+            Directory.CreateDirectory(this.TempDirectory);
+
+            ArrayList remainingFileKeys = new ArrayList(fileKeys);
+            foreach(string fileKey in fileKeys)
+            {
+                InstallPath fileInstallPath = compressedFileMap[fileKey];
+                if(fileInstallPath != null)
+                {
+                    UpdateFileStats(fileKey, fileInstallPath);
+
+                    string filePath = Path.Combine(this.WorkingDirectory, fileInstallPath.SourcePath);
+                    this.LogMessage("copy {0} {1}", filePath, fileKey);
+                    File.Copy(filePath, Path.Combine(this.TempDirectory, fileKey), true);
+                    remainingFileKeys.Remove(fileKey);
+                }
+            }
+
+            if(remainingFileKeys.Count > 0)
+            {
+                this.cabName = mediaCab;
+                this.cabMsg = "extract {0}\\{1}";
+                string[] remainingFileKeysArray = (string[]) remainingFileKeys.ToArray(typeof(string));
+                cab.UnpackFiles(remainingFileKeysArray, this.TempDirectory, remainingFileKeysArray,
+                    this.CabinetProgress);
+            }
+
+            ClearReadOnlyAttribute(this.TempDirectory, fileKeys);
+
+            if(!cabFileIsTemp)
+            {
+                cab = new CabInfo(Path.Combine(this.WorkingDirectory, mediaCab));
+            }
+            this.cabName = mediaCab;
+            this.cabMsg = "compress {0}\\{1}";
+            cab.PackFiles(this.TempDirectory, fileKeys, fileKeys,
+                this.CompressionLevel, this.CabinetProgress);
+
+            if(cabFileIsTemp)
+            {
+              using (Record streamRec = new Record(1))
+              {
+                  streamRec.SetStream(1, cabFile);
+                  this.Execute(String.Format(
+                      "UPDATE `_Streams` SET `Data` = ? WHERE `Name` = '{0}'", mediaCab),
+                      streamRec);
+              }
+            }
+        }
+
+        foreach (KeyValuePair<string, InstallPath> entry in uncompressedFileMap)
+        {
+            UpdateFileStats((string) entry.Key, (InstallPath) entry.Value);
+        }
+    }
+
+    private void UpdateFileStats(string fileKey, InstallPath fileInstallPath)
+    {
+        string filePath = Path.Combine(this.WorkingDirectory, fileInstallPath.SourcePath);
+        if(!File.Exists(filePath))
+        {
+            this.LogMessage("Updated source file not found: {0}", filePath);
+            throw new FileNotFoundException("Updated source file not found: " + filePath);
+        }
+
+        this.LogMessage("updatestats {0}", fileKey);
+
+        string version = Installer.GetFileVersion(filePath);
+        string language = Installer.GetFileLanguage(filePath);
+        long size = new FileInfo(filePath).Length;
+
+        this.Execute("UPDATE `File` SET `Version` = '{0}', `Language` = '{1}', " +
+            "`FileSize` = {2} WHERE `File` = '{3}'", version, language, size, fileKey);
+
+        if ((version == null || version.Length == 0) && this.Tables.Contains("MsiFileHash"))
+        {
+            int[] hash = new int[4];
+            Installer.GetFileHash(filePath, hash);
+            this.Execute("DELETE FROM `MsiFileHash` WHERE `File_` = '{0}'", fileKey);
+            this.Execute("INSERT INTO `MsiFileHash` (`File_`, `Options`, `HashPart1`, `HashPart2`, " +
+                "`HashPart3`, `HashPart4`) VALUES ('" + fileKey + "', 0, {0}, {1}, {2}, {3})",
+                hash[0], hash[1], hash[2], hash[3]);
+        }
+    }
+
+    /// <summary>
+    /// Consolidates a package by combining and re-compressing all files into a single
+    /// internal or external cabinet.
+    /// </summary>
+    /// <param name="mediaCabinet"></param>
+    /// <remarks>If an installation package was built from many merge modules, this
+    /// method can somewhat decrease package size, complexity, and installation time.
+    /// <p>This method will also convert a package with all or mostly uncompressed
+    /// files into a package where all files are compressed.</p>
+    /// <p>If the package contains any not-yet-applied binary file patches (for
+    /// example, a package generated by a call to <see cref="ApplyPatch"/>) then
+    /// this method will apply the patches before compressing the updated files.</p>
+    /// <p>This method edits the database summary information and the File, Media
+    /// and Patch tables as necessary to maintain a valid installation package.</p>
+    /// <p>The cabinet compression level used during re-cabbing can be configured with the
+    /// <see cref="CompressionLevel"/> property.</p>
+    /// </remarks>
+    public void Consolidate(string mediaCabinet)
+    {
+        this.LogMessage("Consolidating package");
+
+        Directory.CreateDirectory(this.TempDirectory);
+
+        this.LogMessage("Extracting/preparing files");
+        this.ProcessFilesByMediaDisk(null,
+            new ProcessFilesOnOneMediaDiskHandler(this.PrepareOneMediaDiskForConsolidation));
+
+        this.LogMessage("Applying any file patches");
+        ApplyFilePatchesForConsolidation();
+
+        this.LogMessage("Clearing PatchPackage, Patch, MsiPatchHeaders tables");
+        if (this.Tables.Contains("PatchPackage"))
+        {
+            this.Execute("DELETE FROM `PatchPackage` WHERE `PatchId` <> ''");
+        }
+        if (this.Tables.Contains("Patch"))
+        {
+            this.Execute("DELETE FROM `Patch` WHERE `File_` <> ''");
+        }
+        if (this.Tables.Contains("MsiPatchHeaders"))
+        {
+            this.Execute("DELETE FROM `MsiPatchHeaders` WHERE `StreamRef` <> ''");
+        }
+
+        this.LogMessage("Resequencing files");
+        ArrayList files = new ArrayList();
+        using(View fileView = this.OpenView("SELECT `File`, `Attributes`, `Sequence` " +
+              "FROM `File` ORDER BY `Sequence`"))
+        {
+            fileView.Execute();
+            
+            foreach (Record fileRec in fileView) using(fileRec)
+            {
+                files.Add(fileRec[1]);
+                int fileAttributes = fileRec.GetInteger(2);
+                fileAttributes &= ~(int) (WixToolset.Dtf.WindowsInstaller.FileAttributes.Compressed
+                    | WixToolset.Dtf.WindowsInstaller.FileAttributes.NonCompressed | WixToolset.Dtf.WindowsInstaller.FileAttributes.PatchAdded);
+                fileRec[2] = fileAttributes;
+                fileRec[3] = files.Count;
+                fileView.Update(fileRec);
+            }
+        }
+
+        bool internalCab = false;
+        if(mediaCabinet.StartsWith("#", StringComparison.Ordinal))
+        {
+            internalCab = true;
+            mediaCabinet = mediaCabinet.Substring(1);
+        }
+
+        this.LogMessage("Cabbing files");
+        string[] fileKeys = (string[]) files.ToArray(typeof(string));
+        string cabPath = Path.Combine(internalCab ? this.TempDirectory
+            : this.WorkingDirectory, mediaCabinet);
+        this.cabName = mediaCabinet;
+        this.cabMsg = "compress {0}\\{1}";
+        new CabInfo(cabPath).PackFiles(this.TempDirectory, fileKeys,
+            fileKeys, this.CompressionLevel, this.CabinetProgress);
+
+        this.DeleteEmbeddedCabs();
+
+        if(internalCab)
+        {
+            this.LogMessage("Inserting cab stream into MSI");
+            Record cabRec = new Record(1);
+            cabRec.SetStream(1, cabPath);
+            this.Execute("INSERT INTO `_Streams` (`Name`, `Data`) VALUES ('" + mediaCabinet + "', ?)", cabRec);
+        }
+
+        this.LogMessage("Inserting cab media record into MSI");
+        this.Execute("DELETE FROM `Media` WHERE `DiskId` <> 0");
+        this.Execute("INSERT INTO `Media` (`DiskId`, `LastSequence`, `Cabinet`) " +
+            "VALUES (1, " + files.Count + ", '" + (internalCab ? "#" : "") + mediaCabinet + "')");
+
+
+        this.LogMessage("Setting compressed flag on package summary info");
+        this.SummaryInfo.WordCount = this.SummaryInfo.WordCount | 2;
+        this.SummaryInfo.Persist();
+    }
+
+    private void DeleteEmbeddedCabs()
+    {
+        using (View view = this.OpenView("SELECT `Cabinet` FROM `Media` WHERE `Cabinet` <> ''"))
+        {
+            view.Execute();
+            
+            foreach (Record rec in view) using(rec)
+            {
+                string cab = rec.GetString(1);
+                if(cab.StartsWith("#", StringComparison.Ordinal))
+                {
+                    cab = cab.Substring(1);
+                    this.LogMessage("Deleting embedded cab stream: {0}", cab);
+                    this.Execute("DELETE FROM `_Streams` WHERE `Name` = '{0}'", cab);
+                }
+            }
+        }
+    }
+
+    private void PrepareOneMediaDiskForConsolidation(string mediaCab,
+        InstallPathMap compressedFileMap, InstallPathMap uncompressedFileMap)
+    {
+        if(compressedFileMap.Count > 0)
+        {
+            string cabFile = null;
+            if(mediaCab.StartsWith("#", StringComparison.Ordinal))
+            {
+                mediaCab = mediaCab.Substring(1);
+
+                using (View streamView = this.OpenView("SELECT `Name`, `Data` FROM `_Streams` " +
+                      "WHERE `Name` = '{0}'", mediaCab))
+                {
+                    streamView.Execute();
+                    Record streamRec = streamView.Fetch();
+                    if(streamRec == null)
+                    {
+                        this.LogMessage("Stream not found: {0}", mediaCab);
+                        throw new InstallerException("Stream not found: " + mediaCab);
+                    }
+                    using(streamRec)
+                    {
+                        this.LogMessage("extract cab {0}", mediaCab);
+                        cabFile = Path.Combine(this.TempDirectory,
+                            Path.GetFileNameWithoutExtension(mediaCab) + ".cab");
+                        streamRec.GetStream("Data", cabFile);
+                    }
+                }
+            }
+            else
+            {
+                cabFile = Path.Combine(this.SourceDirectory, mediaCab);
+            }
+            string[] fileKeys = new string[compressedFileMap.Keys.Count];
+            compressedFileMap.Keys.CopyTo(fileKeys, 0);
+            this.cabName = mediaCab;
+            this.cabMsg = "extract {0}\\{1}";
+            new CabInfo(cabFile).UnpackFiles(fileKeys, this.TempDirectory, fileKeys,
+                this.CabinetProgress);
+            ClearReadOnlyAttribute(this.TempDirectory, fileKeys);
+        }
+        foreach (KeyValuePair<string, InstallPath> entry in uncompressedFileMap)
+        {
+            string fileKey = (string) entry.Key;
+            InstallPath fileInstallPath = (InstallPath) entry.Value;
+
+            string filePath = Path.Combine(this.SourceDirectory, fileInstallPath.SourcePath);
+            this.LogMessage("copy {0} {1}", filePath, fileKey);
+            File.Copy(filePath, Path.Combine(this.TempDirectory, fileKey));
+        }
+    }
+
+    private void ClearReadOnlyAttribute(string baseDirectory, IEnumerable filePaths)
+    {
+        foreach(object filePath in filePaths)
+        {
+            string fullFilePath = Path.Combine(baseDirectory, filePath.ToString());
+            if (File.Exists(fullFilePath))
+            {
+                System.IO.FileAttributes fileAttributes = File.GetAttributes(fullFilePath);
+                if ((fileAttributes & System.IO.FileAttributes.ReadOnly) != 0)
+                {
+                    fileAttributes &= ~System.IO.FileAttributes.ReadOnly;
+                    File.SetAttributes(fullFilePath, fileAttributes);
+                }
+            }
+        }
+    }
+
+    private void ApplyFilePatchesForConsolidation()
+    {
+        if(this.Tables.Contains("Patch"))
+        {
+            using(View patchView = this.OpenView("SELECT `File_`, `Sequence` " +
+                  "FROM `Patch` ORDER BY `Sequence`"))
+            {
+                patchView.Execute();
+                Hashtable extractedPatchCabs = new Hashtable();
+                
+                foreach (Record patchRec in patchView) using(patchRec)
+                {
+                    string fileKey = (string) patchRec[1];
+                    int sequence = patchRec.GetInteger(2);
+                    this.LogMessage("patch {0}", fileKey);
+
+                    string tempPatchFile = Path.Combine(this.TempDirectory, fileKey + ".pat");
+                    ExtractFilePatch(fileKey, sequence, tempPatchFile, extractedPatchCabs);
+                    string filePath = Path.Combine(this.TempDirectory, fileKey);
+                    string oldFilePath = filePath + ".old";
+                    if(File.Exists(oldFilePath)) File.Delete(oldFilePath);
+                    File.Move(filePath, oldFilePath);
+                    Type.GetType("WixToolset.Dtf.WindowsInstaller.FilePatch")
+                        .GetMethod("ApplyPatchToFile",
+                        new Type[] { typeof(string), typeof(string), typeof(string) })
+                        .Invoke(null, new object[] { tempPatchFile, oldFilePath, filePath });
+                }
+            }
+        }
+    }
+
+    private void ExtractFilePatch(string fileKey, int sequence, string extractPath,
+        IDictionary extractedCabs)
+    {
+        string mediaCab = null;
+        using(View mediaView = this.OpenView("SELECT `DiskId`, `LastSequence`, `Cabinet` " +
+              "FROM `Media` ORDER BY `DiskId`"))
+        {
+            mediaView.Execute();
+            
+            foreach (Record mediaRec in mediaView) using(mediaRec)
+            {
+                int mediaMaxSequence = mediaRec.GetInteger(2);
+                if(mediaMaxSequence >= sequence)
+                {
+                    mediaCab = mediaRec.GetString(3);
+                    break;
+                }
+            }
+        }
+
+        if(mediaCab == null || mediaCab.Length == 0)
+        {
+            this.LogMessage("Could not find cabinet for file patch: {0}", fileKey);
+            throw new InstallerException("Could not find cabinet for file patch: " + fileKey);
+        }
+
+        if(!mediaCab.StartsWith("#", StringComparison.Ordinal))
+        {
+            this.LogMessage("Error: Patch cabinet {0} must be embedded", mediaCab);
+            throw new InstallerException("Patch cabinet " + mediaCab + " must be embedded.");
+        }
+        mediaCab = mediaCab.Substring(1);
+
+        string cabFile = (string) extractedCabs[mediaCab];
+        if(cabFile == null)
+        {
+            using(View streamView = this.OpenView("SELECT `Name`, `Data` FROM `_Streams` " +
+                  "WHERE `Name` = '{0}'", mediaCab))
+            {
+                streamView.Execute();
+                Record streamRec = streamView.Fetch();
+                if(streamRec == null)
+                {
+                    this.LogMessage("Stream not found: {0}", mediaCab);
+                    throw new InstallerException("Stream not found: " + mediaCab);
+                }
+                using(streamRec)
+                {
+                    this.LogMessage("extract cab {0}", mediaCab);
+                    Directory.CreateDirectory(this.TempDirectory);
+                    cabFile = Path.Combine(this.TempDirectory,
+                        Path.GetFileNameWithoutExtension(mediaCab) + ".cab");
+                    streamRec.GetStream("Data", cabFile);
+                }
+            }
+            extractedCabs[mediaCab] = cabFile;
+        }
+
+        this.LogMessage("extract patch {0}\\{1}", mediaCab, fileKey);
+        new CabInfo(cabFile).UnpackFile(fileKey, extractPath);
+    }
+
+    /// <summary>
+    /// Rebuilds the cached directory structure information accessed by the
+    /// <see cref="Directories"/> and <see cref="Files"/> properties. This
+    /// should be done after modifying the File, Component, or Directory
+    /// tables, or else the cached information may no longer be accurate.
+    /// </summary>
+    public void UpdateDirectories()
+    {
+        this.dirPathMap = null;
+        this.filePathMap = InstallPathMap.BuildFilePathMap(this,
+            InstallPathMap.BuildComponentPathMap(this, this.Directories), false);
+    }
+
+    /// <summary>
+    /// Gets a mapping from Directory keys to source/target paths.
+    /// </summary>
+    /// <remarks>
+    /// If the Directory table is modified, this mapping
+    /// will be outdated until you call <see cref="UpdateDirectories"/>.
+    /// </remarks>
+    public InstallPathMap Directories
+    {
+        get
+        {
+            if(this.dirPathMap == null)
+            {
+                this.dirPathMap = InstallPathMap.BuildDirectoryPathMap(this, false);
+            }
+            return this.dirPathMap;
+        }
+    }
+    private InstallPathMap dirPathMap;
+
+    /// <summary>
+    /// Gets a mapping from File keys to source/target paths.
+    /// </summary>
+    /// <remarks>
+    /// If the File, Component, or Directory tables are modified, this mapping
+    /// may be outdated until you call <see cref="UpdateDirectories"/>.
+    /// </remarks>
+    public InstallPathMap Files
+    {
+        get
+        {
+            if(this.filePathMap == null)
+            {
+                this.filePathMap = InstallPathMap.BuildFilePathMap(this,
+                    InstallPathMap.BuildComponentPathMap(this, this.Directories), false);
+            }
+            return this.filePathMap;
+        }
+    }
+    private InstallPathMap filePathMap;
+
+    /// <summary>
+    /// Gets or sets the compression level used by <see cref="UpdateFiles()"/>
+    /// and <see cref="Consolidate"/>.
+    /// </summary>
+    /// <remarks>
+    /// If the Directory table is modified, this mapping will be outdated
+    /// until you close and reopen the install package.
+    /// </remarks>
+    public CompressionLevel CompressionLevel
+    {
+        get { return this.compressionLevel; }
+        set { this.compressionLevel = value; }
+    }
+    private CompressionLevel compressionLevel;
+
+    /// <summary>
+    /// Applies a patch package to the database, resulting in an installation package that
+    /// has the patch built-in.
+    /// </summary>
+    /// <param name="patchPackage">The patch package to be applied</param>
+    /// <param name="transform">Optional name of the specific transform to apply.
+    /// This parameter is usually left null, which causes the patch to be searched for
+    /// a transform that is valid to apply to this database.</param>
+    /// <remarks>
+    /// If the patch contains any binary file patches, they will not immediately be applied
+    /// to the target files, though they will at installation time.
+    /// <p>After calling this method you can use <see cref="Consolidate"/> to apply
+    /// the file patches immediately and also discard any outdated files from the package.</p>
+    /// </remarks>
+    public void ApplyPatch(PatchPackage patchPackage, string transform)
+    {
+        if(patchPackage == null) throw new ArgumentNullException("patchPackage");
+
+        this.LogMessage("Applying patch file {0} to database {1}",
+            patchPackage.FilePath, this.FilePath);
+
+        if(transform == null)
+        {
+            this.LogMessage("No transform specified; searching for valid patch transform");
+            string[] validTransforms = patchPackage.GetValidTransforms(this);
+            if(validTransforms.Length == 0)
+            {
+                this.LogMessage("No valid patch transform was found");
+                throw new InvalidOperationException("No valid patch transform was found.");
+            }
+            transform = validTransforms[0];
+        }
+        this.LogMessage("Patch transform = {0}", transform);
+
+        string patchPrefix = Path.GetFileNameWithoutExtension(patchPackage.FilePath) + "_";
+
+        string specialTransform = "#" + transform;
+        Directory.CreateDirectory(this.TempDirectory);
+        this.LogMessage("Extracting substorage {0}", transform);
+        string transformFile = Path.Combine(this.TempDirectory,
+            patchPrefix + Path.GetFileNameWithoutExtension(transform) + ".mst");
+        patchPackage.ExtractTransform(transform, transformFile);
+        this.LogMessage("Extracting substorage {0}", specialTransform);
+        string specialTransformFile = Path.Combine(this.TempDirectory,
+            patchPrefix + Path.GetFileNameWithoutExtension(specialTransform) + ".mst");
+        patchPackage.ExtractTransform(specialTransform, specialTransformFile);
+
+        if (this.Tables.Contains("Patch") && !this.Tables["Patch"].Columns.Contains("_StreamRef"))
+        {
+            if(this.CountRows("Patch") > 0)
+            {
+                this.LogMessage("Warning: non-empty Patch table exists without StreamRef_ column; " +
+                    "patch transform may fail");
+            }
+            else
+            {
+                this.Execute("DROP TABLE `Patch`");
+                this.Execute("CREATE TABLE `Patch` (`File_` CHAR(72) NOT NULL, " +
+                    "`Sequence` INTEGER NOT NULL, `PatchSize` LONG NOT NULL, " +
+                    "`Attributes` INTEGER NOT NULL, `Header` OBJECT, `StreamRef_` CHAR(72)  " +
+                    "PRIMARY KEY `File_`, `Sequence`)");
+            }
+        }
+
+        this.LogMessage("Applying transform {0} to database", transform);
+        this.ApplyTransform(transformFile);
+        this.LogMessage("Applying transform {0} to database", specialTransform);
+        this.ApplyTransform(specialTransformFile);
+
+        if (this.Tables.Contains("MsiPatchHeaders") && this.CountRows("MsiPatchHeaders") > 0 &&
+            (!this.Tables.Contains("Patch") || this.CountRows("Patch", "`StreamRef_` <> ''") == 0))
+        {
+            this.LogMessage("Error: patch transform failed because of missing Patch.StreamRef_ column");
+            throw new InstallerException("Patch transform failed because of missing Patch.StreamRef_ column");
+        }
+
+        IList<int> mediaIds = this.ExecuteIntegerQuery("SELECT `Media_` FROM `PatchPackage` " +
+            "WHERE `PatchId` = '{0}'", patchPackage.PatchCode);
+        if (mediaIds.Count == 0)
+        {
+            this.LogMessage("Warning: PatchPackage Media record not found -- " +
+                "skipping inclusion of patch cabinet");
+        }
+        else
+        {
+            int patchMediaDiskId = mediaIds[0];
+            IList<string> patchCabinets = this.ExecuteStringQuery("SELECT `Cabinet` FROM `Media` " +
+                "WHERE `DiskId` = {0}", patchMediaDiskId);
+            if(patchCabinets.Count == 0)
+            {
+                this.LogMessage("Patch cabinet record not found");
+                throw new InstallerException("Patch cabinet record not found.");
+            }
+            string patchCabinet = patchCabinets[0];
+            this.LogMessage("Patch cabinet = {0}", patchCabinet);
+            if(!patchCabinet.StartsWith("#", StringComparison.Ordinal))
+            {
+                this.LogMessage("Error: Patch cabinet must be embedded");
+                throw new InstallerException("Patch cabinet must be embedded.");
+            }
+            patchCabinet = patchCabinet.Substring(1);
+
+            string renamePatchCabinet = patchPrefix + patchCabinet;
+
+            const int HIGH_DISKID = 30000; // Must not collide with other patch media DiskIDs
+            int renamePatchMediaDiskId = HIGH_DISKID;
+            while (this.CountRows("Media", "`DiskId` = " + renamePatchMediaDiskId) > 0) renamePatchMediaDiskId++;
+
+            // Since the patch cab is now embedded in the MSI, it shouldn't have a separate disk prompt/source
+            this.LogMessage("Renaming the patch media record");
+            int lastSeq = Convert.ToInt32(this.ExecuteScalar("SELECT `LastSequence` FROM `Media` WHERE `DiskId` = {0}", patchMediaDiskId));
+            this.Execute("DELETE FROM `Media` WHERE `DiskId` = {0}", patchMediaDiskId);
+            this.Execute("INSERT INTO `Media` (`DiskId`, `LastSequence`, `Cabinet`) VALUES ({0}, '{1}', '#{2}')",
+                renamePatchMediaDiskId, lastSeq, renamePatchCabinet);
+            this.Execute("UPDATE `PatchPackage` SET `Media_` = {0} WHERE `PatchId` = '{1}'", renamePatchMediaDiskId, patchPackage.PatchCode);
+
+            this.LogMessage("Copying patch cabinet: {0}", patchCabinet);
+            string patchCabFile = Path.Combine(this.TempDirectory,
+                Path.GetFileNameWithoutExtension(patchCabinet) + ".cab");
+            using(View streamView = patchPackage.OpenView("SELECT `Name`, `Data` FROM `_Streams` " +
+                  "WHERE `Name` = '{0}'", patchCabinet))
+            {
+                streamView.Execute();
+                Record streamRec = streamView.Fetch();
+                if(streamRec == null)
+                {
+                    this.LogMessage("Error: Patch cabinet not found");
+                    throw new InstallerException("Patch cabinet not found.");
+                }
+                using(streamRec)
+                {
+                    streamRec.GetStream(2, patchCabFile);
+                }
+            }
+            using(Record patchCabRec = new Record(2))
+            {
+                patchCabRec[1] = patchCabinet;
+                patchCabRec.SetStream(2, patchCabFile);
+                this.Execute("INSERT INTO `_Streams` (`Name`, `Data`) VALUES (?, ?)", patchCabRec);
+            }
+
+            this.LogMessage("Ensuring PatchFiles action exists in InstallExecuteSequence table");
+            if (this.Tables.Contains("InstallExecuteSequence"))
+            {
+                if(this.CountRows("InstallExecuteSequence", "`Action` = 'PatchFiles'") == 0)
+                {
+                    IList<int> installFilesSeqList = this.ExecuteIntegerQuery("SELECT `Sequence` " +
+                        "FROM `InstallExecuteSequence` WHERE `Action` = 'InstallFiles'");
+                    short installFilesSeq = (short) (installFilesSeqList.Count != 0 ?
+                        installFilesSeqList[0] : 0);
+                    this.Execute("INSERT INTO `InstallExecuteSequence` (`Action`, `Sequence`) " +
+                        "VALUES ('PatchFiles', {0})", installFilesSeq + 1);
+                }
+            }
+
+            // Patch-added files need to be marked always-compressed
+            this.LogMessage("Adjusting attributes of patch-added files");
+            using(View fileView = this.OpenView("SELECT `File`, `Attributes`, `Sequence` " +
+                  "FROM `File` ORDER BY `Sequence`"))
+            {
+                fileView.Execute();
+                
+                foreach (Record fileRec in fileView) using(fileRec)
+                {
+                    int fileAttributes = fileRec.GetInteger(2);
+                    if ((fileAttributes & (int) WixToolset.Dtf.WindowsInstaller.FileAttributes.PatchAdded) != 0)
+                    {
+                        fileAttributes = (fileAttributes | (int) WixToolset.Dtf.WindowsInstaller.FileAttributes.Compressed)
+                            & ~(int) WixToolset.Dtf.WindowsInstaller.FileAttributes.NonCompressed
+                            & ~(int) WixToolset.Dtf.WindowsInstaller.FileAttributes.PatchAdded;
+                        fileRec[2] = fileAttributes;
+                        fileView.Update(fileRec);
+                    }
+                }
+            }
+        }
+
+        this.LogMessage("Applying new summary info from patch package");
+        this.SummaryInfo.RevisionNumber = this.Property["PATCHNEWPACKAGECODE"];
+        this.SummaryInfo.Subject = this.Property["PATCHNEWSUMMARYSUBJECT"];
+        this.SummaryInfo.Comments = this.Property["PATCHNEWSUMMARYCOMMENTS"];
+        this.SummaryInfo.Persist();
+        this.Property["PATCHNEWPACKAGECODE"    ] = null;
+        this.Property["PATCHNEWSUMMARYSUBJECT" ] = null;
+        this.Property["PATCHNEWSUMMARYCOMMENTS"] = null;
+
+        this.LogMessage("Patch application finished");
+    }
+
+    /// <summary>
+    /// Accessor for getting and setting properties of the InstallPackage database.
+    /// </summary>
+    public InstallPackageProperties Property
+    {
+        get
+        {
+            if(this.properties == null)
+            {
+                this.properties = new InstallPackageProperties(this);
+            }
+            return this.properties;
+        }
+    }
+    private InstallPackageProperties properties = null;
+}
+
+/// <summary>
+/// Accessor for getting and setting properties of the <see cref="InstallPackage"/> database.
+/// </summary>
+public class InstallPackageProperties
+{
+    internal InstallPackageProperties(InstallPackage installPackage)
+    {
+        this.installPackage = installPackage;
+    }
+    private InstallPackage installPackage;
+
+    /// <summary>
+    /// Gets or sets a property in the database. When getting a property
+    /// that does not exist in the database, an empty string is returned.
+    /// To remove a property from the database, set it to an empty string.
+    /// </summary>
+    /// <remarks>
+    /// This has the same results as direct SQL queries on the Property table; it's only
+    /// meant to be a more convenient way of access.
+    /// </remarks>
+    public string this[string name]
+    {
+        get
+        {
+            IList<string> values = installPackage.ExecuteStringQuery(
+                "SELECT `Value` FROM `Property` WHERE `Property` = '{0}'", name);
+            return (values.Count != 0 ? values[0] : "");
+        }
+        set
+        {
+            Record propRec = new Record(name, (value != null ? value : ""));
+            installPackage.Execute("DELETE FROM `Property` WHERE `Property` = ?", propRec);
+            if(value != null && value.Length != 0)
+            {
+                installPackage.Execute("INSERT INTO `Property` (`Property`, `Value`) VALUES (?, ?)",
+                    propRec);
+            }
+        }
+    }
+}
+
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/InstallPath.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/InstallPath.cs
new file mode 100644
index 00000000..e3ba81b5
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/InstallPath.cs
@@ -0,0 +1,1073 @@
+// 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.Dtf.WindowsInstaller.Package
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Globalization;
+
+    /// <summary>
+    /// Represents the installation path of a file or directory from an installer product database.
+    /// </summary>
+    public class InstallPath
+    {
+        /// <summary>
+        /// Creates a new InstallPath, specifying a filename.
+        /// </summary>
+        /// <param name="name">The name of the file or directory.  Not a full path.</param>
+        public InstallPath(string name) : this(name, false) { }
+
+        /// <summary>
+        /// Creates a new InstallPath, parsing out either the short or long filename.
+        /// </summary>
+        /// <param name="name">The name of the file or directory, in short|long syntax for a filename
+        /// or targetshort|targetlong:sourceshort|sourcelong syntax for a directory.</param>
+        /// <param name="useShortNames">true to parse the short part of the combined filename; false to parse the long part</param>
+        public InstallPath(string name, bool useShortNames)
+        {
+            if(name == null)
+            {
+                throw new ArgumentNullException();
+            }
+            this.parentPath = null;
+            ParseName(name, useShortNames);
+        }
+
+        private void ParseName(string name, bool useShortNames)
+        {
+            string[] parse = name.Split(new char[] { ':' }, 3);
+            if(parse.Length == 3)
+            {
+                // Syntax was targetshort:sourceshort|targetlong:sourcelong.
+                // Chnage it to targetshort|targetlong:sourceshort|sourcelong.
+                parse = name.Split(new char[] { ':', '|' }, 4);
+                if(parse.Length == 4)
+                    parse = new string[] { parse[0] + '|' + parse[2], parse[1] + '|' + parse[3] };
+                else
+                    parse = new string[] { parse[0] + '|' + parse[1], parse[1] + '|' + parse[2] };
+            }
+            string targetName = parse[0];
+            string sourceName = (parse.Length == 2 ? parse[1] : parse[0]);
+            parse = targetName.Split(new char[] { '|' }, 2);
+            if(parse.Length == 2) targetName = (useShortNames ? parse[0] : parse[1]);
+            parse = sourceName.Split(new char[] { '|' }, 2);
+            if(parse.Length == 2) sourceName = (useShortNames ? parse[0] : parse[1]);
+
+            this.SourceName = sourceName;
+            this.TargetName = targetName;
+        }
+
+        /// <summary>
+        /// Gets the path of the parent directory.
+        /// </summary>
+        public InstallPath ParentPath
+        {
+            get
+            {
+                return parentPath;
+            }
+        }
+        internal void SetParentPath(InstallPath value)
+        {
+            parentPath = value;
+            ResetSourcePath();
+            ResetTargetPath();
+        }
+        private InstallPath parentPath;
+
+        /// <summary>
+        /// Gets the set of child paths if this InstallPath object represents a a directory.
+        /// </summary>
+        public InstallPathCollection ChildPaths
+        {
+            get
+            {
+                if(childPaths == null)
+                {
+                    childPaths = new InstallPathCollection(this);
+                }
+                return childPaths;
+            }
+        }
+        private InstallPathCollection childPaths;
+
+        /// <summary>
+        /// Gets or sets the source name of the InstallPath.
+        /// </summary>
+        public string SourceName
+        {
+            get
+            {
+                return sourceName;
+            }
+            set
+            {
+                if(value == null)
+                {
+                    throw new ArgumentNullException();
+                }
+                sourceName = value;
+                ResetSourcePath();
+            }
+        }
+        private string sourceName;
+
+        /// <summary>
+        /// Gets or sets the target name of the install path.
+        /// </summary>
+        public string TargetName
+        {
+            get
+            {
+                return targetName;
+            }
+            set
+            {
+                if(value == null)
+                {
+                    throw new ArgumentNullException();
+                }
+                targetName = value;
+                ResetTargetPath();
+            }
+        }
+        private string targetName;
+
+        /// <summary>
+        /// Gets the full source path.
+        /// </summary>
+        public string SourcePath
+        {
+            get
+            {
+                if(sourcePath == null)
+                {
+                    if(parentPath != null)
+                    {
+                        sourcePath = (sourceName.Equals(".") ? parentPath.SourcePath
+                                      : Path.Combine(parentPath.SourcePath, sourceName));
+                    }
+                    else
+                    {
+                        sourcePath = sourceName;
+                    }
+                }
+                return sourcePath;
+            }
+            set
+            {
+                ResetSourcePath();
+                sourcePath = value;
+            }
+        }
+        private string sourcePath;
+
+        /// <summary>
+        /// Gets the full target path.
+        /// </summary>
+        public string TargetPath
+        {
+            get
+            {
+                if(targetPath == null)
+                {
+                    if(parentPath != null)
+                    {
+                        targetPath = (targetName.Equals(".") ? parentPath.TargetPath
+                                      : Path.Combine(parentPath.TargetPath, targetName));
+                    }
+                    else
+                    {
+                        targetPath = targetName;
+                    }
+                }
+                return targetPath;
+            }
+            set
+            {
+                ResetTargetPath();
+                targetPath = value;
+            }
+        }
+        private string targetPath;
+
+        private void ResetSourcePath()
+        {
+            if(sourcePath != null)
+            {
+                sourcePath = null;
+                if(childPaths != null)
+                {
+                    foreach(InstallPath ip in childPaths)
+                    {
+                        ip.ResetSourcePath();
+                    }
+                }
+            }
+        }
+
+        private void ResetTargetPath()
+        {
+            if(targetPath != null)
+            {
+                targetPath = null;
+                if(childPaths != null)
+                {
+                    foreach(InstallPath ip in childPaths)
+                    {
+                        ip.ResetTargetPath();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the full source path.
+        /// </summary>
+        /// <returns><see cref="SourcePath"/></returns>
+        public override String ToString()
+        {
+            return SourcePath;
+        }
+    }
+
+    /// <summary>
+    /// Represents a collection of InstallPaths that are the child paths of the same parent directory.
+    /// </summary>
+    public class InstallPathCollection : IList<InstallPath>
+    {
+        private InstallPath parentPath;
+        private List<InstallPath> items;
+
+        internal InstallPathCollection(InstallPath parentPath)
+        {
+            this.parentPath = parentPath;
+            this.items = new List<InstallPath>();
+        }
+
+        /// <summary>
+        /// Gets or sets the element at the specified index.
+        /// </summary>
+        public InstallPath this[int index]
+        {
+            get
+            {
+                return this.items[index];
+            }
+            set
+            {
+                this.OnSet(this.items[index], value);
+                this.items[index] = value;
+            }
+        }
+
+        /// <summary>
+        /// Adds a new child path to the collection.
+        /// </summary>
+        /// <param name="item">The InstallPath to add.</param>
+        public void Add(InstallPath item)
+        {
+            this.OnInsert(item);
+            this.items.Add(item);
+        }
+
+        /// <summary>
+        /// Removes a child path to the collection.
+        /// </summary>
+        /// <param name="item">The InstallPath to remove.</param>
+        public bool Remove(InstallPath item)
+        {
+            int index = this.items.IndexOf(item);
+            if (index >= 0)
+            {
+                this.OnRemove(item);
+                this.items.RemoveAt(index);
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets the index of a child path in the collection.
+        /// </summary>
+        /// <param name="item">The InstallPath to search for.</param>
+        /// <returns>The index of the item, or -1 if not found.</returns>
+        public int IndexOf(InstallPath item)
+        {
+            return this.items.IndexOf(item);
+        }
+
+        /// <summary>
+        /// Inserts a child path into the collection.
+        /// </summary>
+        /// <param name="index">The insertion index.</param>
+        /// <param name="item">The InstallPath to insert.</param>
+        public void Insert(int index, InstallPath item)
+        {
+            this.OnInsert(item);
+            this.items.Insert(index, item);
+        }
+
+        /// <summary>
+        /// Tests if the collection contains a child path.
+        /// </summary>
+        /// <param name="item">The InstallPath to search for.</param>
+        /// <returns>true if the item is found; false otherwise</returns>
+        public bool Contains(InstallPath item)
+        {
+            return this.items.Contains(item);
+        }
+
+        /// <summary>
+        /// Copies the collection into an array.
+        /// </summary>
+        /// <param name="array">The array to copy into.</param>
+        /// <param name="index">The starting index in the destination array.</param>
+        public void CopyTo(InstallPath[] array, int index)
+        {
+            this.items.CopyTo(array, index);
+        }
+
+        private void OnInsert(InstallPath item)
+        {
+            if (item.ParentPath != null)
+            {
+                item.ParentPath.ChildPaths.Remove(item);
+            }
+
+            item.SetParentPath(this.parentPath);
+        }
+
+        private void OnRemove(InstallPath item)
+        {
+            item.SetParentPath(null);
+        }
+
+        private void OnSet(InstallPath oldItem, InstallPath newItem)
+        {
+            this.OnRemove(oldItem);
+            this.OnInsert(newItem);
+        }
+
+        /// <summary>
+        /// Removes an item from the collection.
+        /// </summary>
+        /// <param name="index">The index of the item to remove.</param>
+        public void RemoveAt(int index)
+        {
+            this.OnRemove(this[index]);
+            this.items.RemoveAt(index);
+        }
+
+        /// <summary>
+        /// Removes all items from the collection.
+        /// </summary>
+        public void Clear()
+        {
+            foreach (InstallPath item in this)
+            {
+                this.OnRemove(item);
+            }
+
+            this.items.Clear();
+        }
+
+        /// <summary>
+        /// Gets the number of items in the collection.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return this.items.Count;
+            }
+        }
+
+        bool ICollection<InstallPath>.IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets an enumerator over all items in the collection.
+        /// </summary>
+        /// <returns>An enumerator for the collection.</returns>
+        public IEnumerator<InstallPath> GetEnumerator()
+        {
+            return this.items.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return ((IEnumerable<InstallPath>) this).GetEnumerator();
+        }
+    }
+
+    /// <summary>
+    /// Represents a mapping of install paths for all directories, components, or files in
+    /// an installation database.
+    /// </summary>
+    public class InstallPathMap : IDictionary<string, InstallPath>
+    {
+        /// <summary>
+        /// Builds a mapping from File keys to installation paths.
+        /// </summary>
+        /// <param name="db">Installation database.</param>
+        /// <param name="componentPathMap">Component mapping returned by <see cref="BuildComponentPathMap"/>.</param>
+        /// <param name="useShortNames">true to use short file names; false to use long names</param>
+        /// <returns>An InstallPathMap with the described mapping.</returns>
+        public static InstallPathMap BuildFilePathMap(Database db, InstallPathMap componentPathMap,
+            bool useShortNames)
+        {
+            if(db == null)
+            {
+                throw new ArgumentNullException("db");
+            }
+
+            if(componentPathMap == null)
+            {
+                componentPathMap = BuildComponentPathMap(db, BuildDirectoryPathMap(db, useShortNames));
+            }
+
+            InstallPathMap filePathMap = new InstallPathMap();
+
+            using (View fileView = db.OpenView("SELECT `File`, `Component_`, `FileName` FROM `File`"))
+            {
+                fileView.Execute();
+
+                foreach (Record fileRec in fileView)
+                {
+                    using (fileRec)
+                    {
+                        string file = (string) fileRec[1];
+                        string comp = (string) fileRec[2];
+                        string fileName = (string) fileRec[3];
+
+                        InstallPath compPath = (InstallPath) componentPathMap[comp];
+                        if(compPath != null)
+                        {
+                            InstallPath filePath = new InstallPath(fileName, useShortNames);
+                            compPath.ChildPaths.Add(filePath);
+                            filePathMap[file] = filePath;
+                        }
+                    }
+                }
+            }
+
+            return filePathMap;
+        }
+
+        /// <summary>
+        /// Builds a mapping from Component keys to installation paths.
+        /// </summary>
+        /// <param name="db">Installation database.</param>
+        /// <param name="directoryPathMap">Directory mapping returned by
+        /// <see cref="BuildDirectoryPathMap(Database,bool)"/>.</param>
+        /// <returns>An InstallPathMap with the described mapping.</returns>
+        public static InstallPathMap BuildComponentPathMap(Database db, InstallPathMap directoryPathMap)
+        {
+            if(db == null)
+            {
+                throw new ArgumentNullException("db");
+            }
+
+            InstallPathMap compPathMap = new InstallPathMap();
+
+            using (View compView = db.OpenView("SELECT `Component`, `Directory_` FROM `Component`"))
+            {
+                compView.Execute();
+                
+                foreach (Record compRec in compView)
+                {
+                    using (compRec)
+                    {
+                        string comp = (string) compRec[1];
+                        InstallPath dirPath = (InstallPath) directoryPathMap[(string) compRec[2]];
+
+                        if (dirPath != null)
+                        {
+                            compPathMap[comp] = dirPath;
+                        }
+                    }
+                }
+            }
+
+            return compPathMap;
+        }
+
+        /// <summary>
+        /// Builds a mapping from Directory keys to installation paths.
+        /// </summary>
+        /// <param name="db">Installation database.</param>
+        /// <param name="useShortNames">true to use short directory names; false to use long names</param>
+        /// <returns>An InstallPathMap with the described mapping.</returns>
+        public static InstallPathMap BuildDirectoryPathMap(Database db, bool useShortNames)
+        {
+            return BuildDirectoryPathMap(db, useShortNames, null, null);
+        }
+
+        /// <summary>
+        /// Builds a mapping of Directory keys to directory paths, specifying root directories
+        /// for the source and target paths.
+        /// </summary>
+        /// <param name="db">Database containing the Directory table.</param>
+        /// <param name="useShortNames">true to use short directory names; false to use long names</param>
+        /// <param name="sourceRootDir">The root directory path of all source paths, or null to leave them relative.</param>
+        /// <param name="targetRootDir">The root directory path of all source paths, or null to leave them relative.</param>
+        /// <returns>An InstallPathMap with the described mapping.</returns>
+        public static InstallPathMap BuildDirectoryPathMap(Database db, bool useShortNames,
+            string sourceRootDir, string targetRootDir)
+        {
+            if(db == null)
+            {
+                throw new ArgumentNullException("db");
+            }
+
+            if(sourceRootDir == null) sourceRootDir = "";
+            if(targetRootDir == null) targetRootDir = "";
+
+            InstallPathMap dirMap = new InstallPathMap();
+            IDictionary dirTreeMap = new Hashtable();
+
+            using (View dirView = db.OpenView("SELECT `Directory`, `Directory_Parent`, `DefaultDir` FROM `Directory`"))
+            {
+                dirView.Execute();
+
+                foreach (Record dirRec in dirView) using (dirRec)
+                {
+                    string key = (string) dirRec[1];
+                    string parentKey = (string) dirRec[2];
+                    InstallPath dir = new InstallPath((string) dirRec[3], useShortNames);
+
+                    dirMap[key] = dir;
+
+                    InstallPathMap siblingDirs = (InstallPathMap) dirTreeMap[parentKey];
+                    if (siblingDirs == null)
+                    {
+                        siblingDirs = new InstallPathMap();
+                        dirTreeMap[parentKey] = siblingDirs;
+                    }
+                    siblingDirs.Add(key, dir);
+                }
+            }
+
+            foreach (KeyValuePair<string, InstallPath> entry in (InstallPathMap) dirTreeMap[""])
+            {
+                string key = (string) entry.Key;
+                InstallPath dir = (InstallPath) entry.Value;
+                LinkSubdirectories(key, dir, dirTreeMap);
+            }
+
+            InstallPath targetDirPath = (InstallPath) dirMap["TARGETDIR"];
+            if(targetDirPath != null)
+            {
+                targetDirPath.SourcePath = sourceRootDir;
+                targetDirPath.TargetPath = targetRootDir;
+            }
+
+            return dirMap;
+        }
+
+        private static void LinkSubdirectories(string key, InstallPath dir, IDictionary dirTreeMap)
+        {
+            InstallPathMap subDirs = (InstallPathMap) dirTreeMap[key];
+            if(subDirs != null)
+            {
+                foreach (KeyValuePair<string, InstallPath> entry in subDirs)
+                {
+                    string subKey = (string) entry.Key;
+                    InstallPath subDir = (InstallPath) entry.Value;
+                    dir.ChildPaths.Add(subDir);
+                    LinkSubdirectories(subKey, subDir, dirTreeMap);
+                }
+            }
+        }
+
+        private Dictionary<string, InstallPath> items;
+
+        /// <summary>
+        /// Creates a new empty InstallPathMap.
+        /// </summary>
+        public InstallPathMap()
+        {
+            this.items = new Dictionary<string,InstallPath>(StringComparer.Ordinal);
+        }
+
+        /// <summary>
+        /// Gets a mapping from keys to source paths.
+        /// </summary>
+        public IDictionary<string, string> SourcePaths
+        {
+            get
+            {
+                return new SourcePathMap(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets a mapping from keys to target paths.
+        /// </summary>
+        public IDictionary<string, string> TargetPaths
+        {
+            get
+            {
+                return new TargetPathMap(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets an install path for a direcotry, component, or file key.
+        /// </summary>
+        /// <param name="key">Depending on the type of InstallPathMap, this is the primary key from the
+        /// either the Directory, Component, or File table.</param>
+        /// <remarks>
+        /// Changing an install path does not modify the Database used to generate this InstallPathMap.
+        /// </remarks>
+        public InstallPath this[string key]
+        {
+            get
+            {
+                InstallPath value = null;
+                this.items.TryGetValue(key, out value);
+                return value;
+            }
+            set
+            {
+                this.items[key] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of keys in the InstallPathMap. Depending on the type of InstallPathMap,
+        /// they are all directory, component, or file key strings.
+        /// </summary>
+        public ICollection<string> Keys
+        {
+            get
+            {
+                return this.items.Keys;
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of InstallPath values in the InstallPathMap.
+        /// </summary>
+        public ICollection<InstallPath> Values
+        {
+            get
+            {
+                return this.items.Values;
+            }
+        }
+
+        /// <summary>
+        /// Sets an install path for a direcotry, component, or file key.
+        /// </summary>
+        /// <param name="key">Depending on the type of InstallPathMap, this is the primary key from the
+        /// either the Directory, Component, or File table.</param>
+        /// <param name="installPath">The install path of the key item.</param>
+        /// <remarks>
+        /// Changing an install path does not modify the Database used to generate this InstallPathMap.
+        /// </remarks>
+        public void Add(string key, InstallPath installPath)
+        {
+            this.items.Add(key, installPath);
+        }
+
+        /// <summary>
+        /// Removes an install path from the map.
+        /// </summary>
+        /// <param name="key">Depending on the type of InstallPathMap, this is the primary key from the
+        /// either the Directory, Component, or File table.</param>
+        /// <returns>true if the item was removed, false if it did not exist</returns>
+        /// <remarks>
+        /// Changing an install path does not modify the Database used to generate this InstallPathMap.
+        /// </remarks>
+        public bool Remove(string key)
+        {
+            return this.items.Remove(key);
+        }
+
+        /// <summary>
+        /// Tests whether a direcotry, component, or file key exists in the map.
+        /// </summary>
+        /// <param name="key">Depending on the type of InstallPathMap, this is the primary key from the
+        /// either the Directory, Component, or File table.</param>
+        /// <returns>true if the key is found; false otherwise</returns>
+        public bool ContainsKey(string key)
+        {
+            return this.items.ContainsKey(key);
+        }
+
+        /*
+        public override string ToString()
+        {
+            System.Text.StringBuilder buf = new System.Text.StringBuilder();
+            foreach(KeyValuePair<string, InstallPath> entry in this)
+            {
+                buf.AppendFormat("{0}={1}", entry.Key, entry.Value);
+                buf.Append("\n");
+            }
+            return buf.ToString();
+        }
+        */
+
+        /// <summary>
+        /// Attempts to get a value from the dictionary.
+        /// </summary>
+        /// <param name="key">The key to lookup.</param>
+        /// <param name="value">Receives the value, or null if they key was not found.</param>
+        /// <returns>True if the value was found, else false.</returns>
+        public bool TryGetValue(string key, out InstallPath value)
+        {
+            return this.items.TryGetValue(key, out value);
+        }
+
+        void ICollection<KeyValuePair<string, InstallPath>>.Add(KeyValuePair<string, InstallPath> item)
+        {
+            ((ICollection<KeyValuePair<string, InstallPath>>) this.items).Add(item);
+        }
+
+        /// <summary>
+        /// Removes all entries from the dictionary.
+        /// </summary>
+        public void Clear()
+        {
+            this.items.Clear();
+        }
+
+        bool ICollection<KeyValuePair<string, InstallPath>>.Contains(KeyValuePair<string, InstallPath> item)
+        {
+            return ((ICollection<KeyValuePair<string, InstallPath>>) this.items).Contains(item);
+        }
+
+        void ICollection<KeyValuePair<string, InstallPath>>.CopyTo(KeyValuePair<string, InstallPath>[] array, int arrayIndex)
+        {
+            ((ICollection<KeyValuePair<string, InstallPath>>) this.items).CopyTo(array, arrayIndex);
+        }
+
+        /// <summary>
+        /// Gets the number of entries in the dictionary.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return this.items.Count;
+            }
+        }
+
+        bool ICollection<KeyValuePair<string, InstallPath>>.IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        bool ICollection<KeyValuePair<string, InstallPath>>.Remove(KeyValuePair<string, InstallPath> item)
+        {
+            return ((ICollection<KeyValuePair<string, InstallPath>>) this.items).Remove(item);
+        }
+
+        /// <summary>
+        /// Gets an enumerator over all entries in the dictionary.
+        /// </summary>
+        /// <returns>An enumerator for the dictionary.</returns>
+        public IEnumerator<KeyValuePair<string, InstallPath>> GetEnumerator()
+        {
+            return this.items.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.items.GetEnumerator();
+        }
+    }
+
+    internal class SourcePathMap : IDictionary<string, string>
+    {
+        private const string RO_MSG =
+            "The SourcePathMap collection is read-only. " +
+            "Modify the InstallPathMap instead.";
+
+        private InstallPathMap map;
+
+        internal SourcePathMap(InstallPathMap map)
+        {
+            this.map = map;
+        }
+
+        public void Add(string key, string value)
+        {
+            throw new InvalidOperationException(RO_MSG);
+        }
+
+        public bool ContainsKey(string key)
+        {
+            return this.map.ContainsKey(key);
+        }
+
+        public ICollection<string> Keys
+        {
+            get
+            {
+                return this.map.Keys;
+            }
+        }
+
+        public bool Remove(string key)
+        {
+            throw new InvalidOperationException(RO_MSG);
+        }
+
+        public bool TryGetValue(string key, out string value)
+        {
+            InstallPath installPath;
+            if (this.map.TryGetValue(key, out installPath))
+            {
+                value = installPath.SourcePath;
+                return true;
+            }
+            else
+            {
+                value = null;
+                return false;
+            }
+        }
+
+        public ICollection<string> Values
+        {
+            get
+            {
+                List<string> values = new List<string>(this.Count);
+                foreach (KeyValuePair<string, InstallPath> entry in this.map)
+                {
+                    values.Add(entry.Value.SourcePath);
+                }
+                return values;
+            }
+        }
+
+        public string this[string key]
+        {
+            get
+            {
+                string value = null;
+                this.TryGetValue(key, out value);
+                return value;
+            }
+            set
+            {
+                throw new InvalidOperationException(RO_MSG);
+            }
+        }
+
+        public void Add(KeyValuePair<string, string> item)
+        {
+            throw new InvalidOperationException(RO_MSG);
+        }
+
+        public void Clear()
+        {
+            throw new InvalidOperationException(RO_MSG);
+        }
+
+        public bool Contains(KeyValuePair<string, string> item)
+        {
+            string value = this[item.Key];
+            return value == item.Value;
+        }
+
+        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex)
+        {
+            foreach (KeyValuePair<string, string> entry in this)
+            {
+                array[arrayIndex] = entry;
+                arrayIndex++;
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                return this.map.Count;
+            }
+        }
+
+        public bool IsReadOnly
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        public bool Remove(KeyValuePair<string, string> item)
+        {
+            throw new InvalidOperationException(RO_MSG);
+        }
+
+        public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
+        {
+            foreach (KeyValuePair<string, InstallPath> entry in this.map)
+            {
+                yield return new KeyValuePair<string, string>(
+                    entry.Key, entry.Value.SourcePath);
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+
+    internal class TargetPathMap : IDictionary<string, string>
+    {
+        private const string RO_MSG =
+            "The TargetPathMap collection is read-only. " +
+            "Modify the InstallPathMap instead.";
+
+        private InstallPathMap map;
+
+        internal TargetPathMap(InstallPathMap map)
+        {
+            this.map = map;
+        }
+
+        public void Add(string key, string value)
+        {
+            throw new InvalidOperationException(RO_MSG);
+        }
+
+        public bool ContainsKey(string key)
+        {
+            return this.map.ContainsKey(key);
+        }
+
+        public ICollection<string> Keys
+        {
+            get
+            {
+                return this.map.Keys;
+            }
+        }
+
+        public bool Remove(string key)
+        {
+            throw new InvalidOperationException(RO_MSG);
+        }
+
+        public bool TryGetValue(string key, out string value)
+        {
+            InstallPath installPath;
+            if (this.map.TryGetValue(key, out installPath))
+            {
+                value = installPath.TargetPath;
+                return true;
+            }
+            else
+            {
+                value = null;
+                return false;
+            }
+        }
+
+        public ICollection<string> Values
+        {
+            get
+            {
+                List<string> values = new List<string>(this.Count);
+                foreach (KeyValuePair<string, InstallPath> entry in this.map)
+                {
+                    values.Add(entry.Value.TargetPath);
+                }
+                return values;
+            }
+        }
+
+        public string this[string key]
+        {
+            get
+            {
+                string value = null;
+                this.TryGetValue(key, out value);
+                return value;
+            }
+            set
+            {
+                throw new InvalidOperationException(RO_MSG);
+            }
+        }
+
+        public void Add(KeyValuePair<string, string> item)
+        {
+            throw new InvalidOperationException(RO_MSG);
+        }
+
+        public void Clear()
+        {
+            throw new InvalidOperationException(RO_MSG);
+        }
+
+        public bool Contains(KeyValuePair<string, string> item)
+        {
+            string value = this[item.Key];
+            return value == item.Value;
+        }
+
+        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex)
+        {
+            foreach (KeyValuePair<string, string> entry in this)
+            {
+                array[arrayIndex] = entry;
+                arrayIndex++;
+            }
+        }
+
+        public int Count
+        {
+            get
+            {
+                return this.map.Count;
+            }
+        }
+
+        public bool IsReadOnly
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        public bool Remove(KeyValuePair<string, string> item)
+        {
+            throw new InvalidOperationException(RO_MSG);
+        }
+
+        public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
+        {
+            foreach (KeyValuePair<string, InstallPath> entry in this.map)
+            {
+                yield return new KeyValuePair<string, string>(
+                    entry.Key, entry.Value.TargetPath);
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/PatchPackage.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/PatchPackage.cs
new file mode 100644
index 00000000..54bd2b93
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/PatchPackage.cs
@@ -0,0 +1,259 @@
+// 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.Dtf.WindowsInstaller.Package
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Collections;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// Provides access to convenient properties and operations on a patch package (.MSP).
+    /// </summary>
+    public class PatchPackage : Database
+    {
+        /// <summary>
+        /// Creates a new patch package object; opening the patch database in read-only mode.
+        /// </summary>
+        /// <param name="packagePath">Path to the patch package (.MSP)</param>
+        /// <remarks>The PatchPackage object only opens the patch database in read-only mode, because
+        /// transforms (sub-storages) cannot be read if the database is open in read-write mode.</remarks>
+        public PatchPackage(string packagePath)
+            : base(packagePath, (DatabaseOpenMode) ((int) DatabaseOpenMode.ReadOnly | 32))
+            // TODO: figure out what to do about DatabaseOpenMode.Patch
+        {
+        }
+
+        /// <summary>
+        /// Handle this event to receive status messages when operations are performed on the patch package.
+        /// </summary>
+        /// <example>
+        /// <c>patchPackage.Message += new InstallPackageMessageHandler(Console.WriteLine);</c>
+        /// </example>
+        public event InstallPackageMessageHandler Message;
+
+        /// <summary>
+        /// Sends a message to the <see cref="Message"/> event-handler.
+        /// </summary>
+        /// <param name="format">Message string, containing 0 or more format items</param>
+        /// <param name="args">Items to be formatted</param>
+        protected void LogMessage(string format, params object[] args)
+        {
+            if(this.Message != null)
+            {
+                this.Message(format, args);
+            }
+        }
+
+        /// <summary>
+        /// Gets the patch code (GUID) of the patch package.
+        /// </summary>
+        /// <remarks>
+        /// The patch code is stored in the RevisionNumber field of the patch summary information.
+        /// </remarks>
+        public string PatchCode
+        {
+            get
+            {
+                string guids = this.SummaryInfo.RevisionNumber;
+                return guids.Substring(0, guids.IndexOf('}') + 1);
+            }
+        }
+
+        /// <summary>
+        /// Gets the list of patch codes that are replaced by this patch package.
+        /// </summary>
+        /// <returns>Array of replaced patch codes (GUIDs)</returns>
+        /// <remarks>
+        /// The list of replaced patch codes is stored in the RevisionNumber field of the patch summary information.
+        /// </remarks>
+        public string[] GetReplacedPatchCodes()
+        {
+            ArrayList patchCodeList = new ArrayList();
+            string guids = this.SummaryInfo.RevisionNumber;
+            int thisGuid = guids.IndexOf('}') + 1;
+            int nextGuid = guids.IndexOf('}', thisGuid) + 1;
+            while(nextGuid > 0)
+            {
+                patchCodeList.Add(guids.Substring(thisGuid, (nextGuid - thisGuid)));
+                thisGuid = nextGuid;
+                nextGuid = guids.IndexOf('}', thisGuid) + 1;
+            }
+            return (string[]) patchCodeList.ToArray(typeof(string));
+        }
+
+        /// <summary>
+        /// Gets the list of product codes of products targeted by this patch package.
+        /// </summary>
+        /// <returns>Array of product codes (GUIDs)</returns>
+        /// <remarks>
+        /// The list of target product codes is stored in the Template field of the patch summary information.
+        /// </remarks>
+        public string[] GetTargetProductCodes()
+        {
+            string productList = this.SummaryInfo.Template;
+            return productList.Split(';');
+        }
+
+        /// <summary>
+        /// Gets the names of the transforms included in the patch package.
+        /// </summary>
+        /// <returns>Array of transform names</returns>
+        /// <remarks>
+        /// The returned list does not include the &quot;patch special transforms&quot; that are prefixed with &quot;#&quot;
+        /// <p>The list of transform names is stored in the LastSavedBy field of the patch summary information.</p>
+        /// </remarks>
+        public string[] GetTransforms()
+        {
+            return this.GetTransforms(false);
+        }
+        /// <summary>
+        /// Gets the names of the transforms included in the patch package.
+        /// </summary>
+        /// <param name="includeSpecialTransforms">Specifies whether to include the
+        /// &quot;patch special transforms&quot; that are prefixed with &quot;#&quot;</param>
+        /// <returns>Array of transform names</returns>
+        /// <remarks>
+        /// The list of transform names is stored in the LastSavedBy field of the patch summary information.
+        /// </remarks>
+        public string[] GetTransforms(bool includeSpecialTransforms)
+        {
+            ArrayList transformArray = new ArrayList();
+            string transformList = this.SummaryInfo.LastSavedBy;
+            foreach(string transform in transformList.Split(';', ':'))
+            {
+                if(transform.Length != 0 && (includeSpecialTransforms || !transform.StartsWith("#", StringComparison.Ordinal)))
+                {
+                    transformArray.Add(transform);
+                }
+            }
+            return (string[]) transformArray.ToArray(typeof(string));
+        }
+
+        /// <summary>
+        /// Gets information about the transforms included in the patch package.
+        /// </summary>
+        /// <returns>Array containing information about each transform</returns>
+        /// <remarks>
+        /// The returned info does not include the &quot;patch special transforms&quot; that are prefixed with &quot;#&quot;
+        /// </remarks>
+        public TransformInfo[] GetTransformsInfo()
+        {
+            return this.GetTransformsInfo(false);
+        }
+
+        /// <summary>
+        /// Gets information about the transforms included in the patch package.
+        /// </summary>
+        /// <param name="includeSpecialTransforms">Specifies whether to include the
+        /// &quot;patch special transforms&quot; that are prefixed with &quot;#&quot;</param>
+        /// <returns>Array containing information about each transform</returns>
+        public TransformInfo[] GetTransformsInfo(bool includeSpecialTransforms)
+        {
+            string[] transforms = this.GetTransforms(includeSpecialTransforms);
+            ArrayList transformInfoArray = new ArrayList(transforms.Length);
+            foreach(string transform in transforms)
+            {
+                transformInfoArray.Add(this.GetTransformInfo(transform));
+            }
+            return (TransformInfo[]) transformInfoArray.ToArray(typeof(TransformInfo));
+        }
+
+        /// <summary>
+        /// Gets information about a transforms included in the patch package.
+        /// </summary>
+        /// <param name="transform">Name of the transform to extract; this may optionally be a
+        /// special transform prefixed by &quot;#&quot;</param>
+        /// <returns>Information about the transform</returns>
+        public TransformInfo GetTransformInfo(string transform)
+        {
+            string tempTransformFile = null;
+            try
+            {
+                tempTransformFile = Path.GetTempFileName();
+                this.ExtractTransform(transform, tempTransformFile);
+                using(SummaryInfo transformSummInfo = new SummaryInfo(tempTransformFile, false))
+                {
+                    return new TransformInfo(transform, transformSummInfo);
+                }
+            }
+            finally
+            {
+                if(tempTransformFile != null && File.Exists(tempTransformFile))
+                {
+                    File.Delete(tempTransformFile);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Analyzes the transforms included in the patch package to find the ones that
+        /// are applicable to an install package.
+        /// </summary>
+        /// <param name="installPackage">The install package to validate the transforms against</param>
+        /// <returns>Array of valid transform names</returns>
+        /// <remarks>
+        /// The returned list does not include the &quot;patch special transforms&quot; that
+        /// are prefixed with &quot;#&quot; If a transform is valid, then its corresponding
+        /// special transform is assumed to be valid as well.
+        /// </remarks>
+        public string[] GetValidTransforms(InstallPackage installPackage)
+        {
+            ArrayList transformArray = new ArrayList();
+            string transformList = this.SummaryInfo.LastSavedBy;
+            foreach(string transform in transformList.Split(';', ':'))
+            {
+                if(transform.Length != 0 && !transform.StartsWith("#", StringComparison.Ordinal))
+                {
+                    this.LogMessage("Checking validity of transform {0}", transform);
+                    string tempTransformFile = null;
+                    try
+                    {
+                        tempTransformFile = Path.GetTempFileName();
+                        this.ExtractTransform(transform, tempTransformFile);
+                        if(installPackage.IsTransformValid(tempTransformFile))
+                        {
+                            this.LogMessage("Found valid transform: {0}", transform);
+                            transformArray.Add(transform);
+                        }
+                    }
+                    finally
+                    {
+                        if(tempTransformFile != null && File.Exists(tempTransformFile))
+                        {
+                            try { File.Delete(tempTransformFile); } 
+                            catch(IOException) { }
+                        }
+                    }
+                }
+            }
+            return (string[]) transformArray.ToArray(typeof(string));
+        }
+
+        /// <summary>
+        /// Extracts a transform (.MST) from a patch package.
+        /// </summary>
+        /// <param name="transform">Name of the transform to extract; this may optionally be a
+        /// special transform prefixed by &quot;#&quot;</param>
+        /// <param name="extractFile">Location where the transform will be extracted</param>
+        public void ExtractTransform(string transform, string extractFile)
+        {
+            using(View stgView = this.OpenView("SELECT `Name`, `Data` FROM `_Storages` WHERE `Name` = '{0}'", transform))
+            {
+                stgView.Execute();
+                Record stgRec = stgView.Fetch();
+                if(stgRec == null)
+                {
+                    this.LogMessage("Transform not found: {0}", transform);
+                    throw new InstallerException("Transform not found: " + transform);
+                }
+                using(stgRec)
+                {
+                    stgRec.GetStream("Data", extractFile);
+                }
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/TransformInfo.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/TransformInfo.cs
new file mode 100644
index 00000000..0bf3d3f9
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/TransformInfo.cs
@@ -0,0 +1,154 @@
+// 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.Dtf.WindowsInstaller.Package
+{
+    using System;
+    using System.IO;
+    using System.Globalization;
+
+    /// <summary>
+    /// Contains properties of a transform package (.MST).
+    /// </summary>
+    public class TransformInfo
+    {
+        /// <summary>
+        /// Reads transform information from a transform package.
+        /// </summary>
+        /// <param name="mstFile">Path to a transform package (.MST file).</param>
+        public TransformInfo(string mstFile)
+        {
+            this.name = Path.GetFileName(mstFile);
+            using (SummaryInfo transformSummInfo = new SummaryInfo(mstFile, false))
+            {
+                this.DecodeSummaryInfo(transformSummInfo);
+            }
+        }
+
+        /// <summary>
+        /// Reads transform information from the summary information of a transform package.
+        /// </summary>
+        /// <param name="name">Filename of the transform (optional).</param>
+        /// <param name="transformSummaryInfo">Handle to the summary information of a transform package (.MST file).</param>
+        public TransformInfo(string name, SummaryInfo transformSummaryInfo)
+        {
+            this.name = name;
+            this.DecodeSummaryInfo(transformSummaryInfo);
+        }
+
+        private void DecodeSummaryInfo(SummaryInfo transformSummaryInfo)
+        {
+            try
+            {
+                string[] rev = transformSummaryInfo.RevisionNumber.Split(new char[] { ';' }, 3);
+                this.targetProductCode = rev[0].Substring(0, 38);
+                this.targetProductVersion = rev[0].Substring(38);
+                this.upgradeProductCode = rev[1].Substring(0, 38);
+                this.upgradeProductVersion = rev[1].Substring(38);
+                this.upgradeCode = rev[2];
+
+                string[] templ = transformSummaryInfo.Template.Split(new Char[] { ';' }, 2);
+                this.targetPlatform = templ[0];
+                this.targetLanguage = 0;
+                if (templ.Length >= 2 && templ[1].Length > 0)
+                {
+                    this.targetLanguage = Int32.Parse(templ[1], CultureInfo.InvariantCulture.NumberFormat);
+                }
+
+                this.validateFlags = (TransformValidations) transformSummaryInfo.CharacterCount;
+            }
+            catch (Exception ex)
+            {
+                throw new InstallerException("Invalid transform summary info", ex);
+            }
+        }
+
+        /// <summary>
+        /// Gets the filename of the transform.
+        /// </summary>
+        public string Name
+        {
+            get { return this.name; }
+        }
+        private string name;
+
+        /// <summary>
+        /// Gets the target product code of the transform.
+        /// </summary>
+        public string TargetProductCode
+        {
+            get { return this.targetProductCode; }
+        }
+        private string targetProductCode;
+
+        /// <summary>
+        /// Gets the target product version of the transform.
+        /// </summary>
+        public string TargetProductVersion
+        {
+            get { return this.targetProductVersion; }
+        }
+        private string targetProductVersion;
+
+        /// <summary>
+        /// Gets the upgrade product code of the transform.
+        /// </summary>
+        public string UpgradeProductCode
+        {
+            get { return this.upgradeProductCode; }
+        }
+        private string upgradeProductCode;
+
+        /// <summary>
+        /// Gets the upgrade product version of the transform.
+        /// </summary>
+        public string UpgradeProductVersion
+        {
+            get { return this.upgradeProductVersion; }
+        }
+        private string upgradeProductVersion;
+
+        /// <summary>
+        /// Gets the upgrade code of the transform.
+        /// </summary>
+        public string UpgradeCode
+        {
+            get { return this.upgradeCode; }
+        }
+        private string upgradeCode;
+
+        /// <summary>
+        /// Gets the target platform of the transform.
+        /// </summary>
+        public string TargetPlatform
+        {
+            get { return this.targetPlatform; }
+        }
+        private string targetPlatform;
+
+        /// <summary>
+        /// Gets the target language of the transform, or 0 if the transform is language-neutral.
+        /// </summary>
+        public int TargetLanguage
+        {
+            get { return this.targetLanguage; }
+        }
+        private int targetLanguage;
+
+        /// <summary>
+        /// Gets the validation flags specified when the transform was generated.
+        /// </summary>
+        public TransformValidations Validations
+        {
+            get { return this.validateFlags; }
+        }
+        private TransformValidations validateFlags;
+
+        /// <summary>
+        /// Returns the name of the transform.
+        /// </summary>
+        public override string ToString()
+        {
+            return (this.Name != null ? this.Name : "MST");
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
new file mode 100644
index 00000000..28ded687
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller.Package/WixToolset.Dtf.WindowsInstaller.Package.csproj
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>WixToolset.Dtf.WindowsInstaller</RootNamespace>
+    <AssemblyName>WixToolset.Dtf.WindowsInstaller.Package</AssemblyName>
+    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <Description>Extended managed libraries for Windows Installer</Description>
+    <CreateDocumentationFile>true</CreateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" />
+    <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
+    <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  </ItemGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/ColumnCollection.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/ColumnCollection.cs
new file mode 100644
index 00000000..9a452da1
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/ColumnCollection.cs
@@ -0,0 +1,333 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Text;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Collection of column information related to a <see cref="TableInfo"/> or
+    /// <see cref="View"/>.
+    /// </summary>
+    public sealed class ColumnCollection : ICollection<ColumnInfo>
+    {
+        private IList<ColumnInfo> columns;
+        private string formatString;
+
+        /// <summary>
+        /// Creates a new ColumnCollection based on a specified list of columns.
+        /// </summary>
+        /// <param name="columns">columns to be added to the new collection</param>
+        public ColumnCollection(ICollection<ColumnInfo> columns)
+        {
+            if (columns == null)
+            {
+                throw new ArgumentNullException("columns");
+            }
+
+            this.columns = new List<ColumnInfo>(columns);
+        }
+
+        /// <summary>
+        /// Creates a new ColumnCollection that is associated with a database table.
+        /// </summary>
+        /// <param name="view">view that contains the columns</param>
+        internal ColumnCollection(View view)
+        {
+            if (view == null)
+            {
+                throw new ArgumentNullException("view");
+            }
+
+            this.columns = ColumnCollection.GetViewColumns(view);
+        }
+
+        /// <summary>
+        /// Gets the number of columns in the collection.
+        /// </summary>
+        /// <value>number of columns in the collection</value>
+        public int Count
+        {
+            get
+            {
+                return this.columns.Count;
+            }
+        }
+
+        /// <summary>
+        /// Gets a boolean value indicating whether the collection is read-only.
+        /// A ColumnCollection is read-only if it is associated with a <see cref="View"/>
+        /// or a read-only <see cref="Database"/>.
+        /// </summary>
+        /// <value>read-only status of the collection</value>
+        public bool IsReadOnly
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        /// <summary>
+        /// Gets information about a specific column in the collection.
+        /// </summary>
+        /// <param name="columnIndex">1-based index into the column collection</param>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="columnIndex"/> is less
+        /// than 1 or greater than the number of columns in the collection</exception>
+        public ColumnInfo this[int columnIndex]
+        {
+            get
+            {
+                if (columnIndex >= 0 && columnIndex < this.columns.Count)
+                {
+                    return this.columns[columnIndex];
+                }
+                else
+                {
+                    throw new ArgumentOutOfRangeException("columnIndex");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets information about a specific column in the collection.
+        /// </summary>
+        /// <param name="columnName">case-sensitive name of a column collection</param>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="columnName"/> does
+        /// not exist in the collection</exception>
+        public ColumnInfo this[string columnName]
+        {
+            get
+            {
+                if (String.IsNullOrEmpty(columnName))
+                {
+                    throw new ArgumentNullException("columnName");
+                }
+
+                foreach (ColumnInfo colInfo in this.columns)
+                {
+                    if (colInfo.Name == columnName)
+                    {
+                        return colInfo;
+                    }
+                }
+
+                throw new ArgumentOutOfRangeException("columnName");
+            }
+        }
+
+        /// <summary>
+        /// Not supported because the collection is read-only.
+        /// </summary>
+        /// <param name="item">information about the column being added</param>
+        /// <exception cref="InvalidOperationException">the collection is read-only</exception>
+        public void Add(ColumnInfo item)
+        {
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Not supported because the collection is read-only.
+        /// </summary>
+        /// <exception cref="InvalidOperationException">the collection is read-only</exception>
+        public void Clear()
+        {
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Checks if a column with a given name exists in the collection.
+        /// </summary>
+        /// <param name="columnName">case-sensitive name of the column to look for</param>
+        /// <returns>true if the column exists in the collection, false otherwise</returns>
+        public bool Contains(string columnName)
+        {
+            return this.IndexOf(columnName) >= 0;
+        }
+
+        /// <summary>
+        /// Checks if a column with a given name exists in the collection.
+        /// </summary>
+        /// <param name="column">column to look for, with case-sensitive name</param>
+        /// <returns>true if the column exists in the collection, false otherwise</returns>
+        bool ICollection<ColumnInfo>.Contains(ColumnInfo column)
+        {
+            return this.Contains(column.Name);
+        }
+
+        /// <summary>
+        /// Gets the index of a column within the collection.
+        /// </summary>
+        /// <param name="columnName">case-sensitive name of the column to look for</param>
+        /// <returns>0-based index of the column, or -1 if not found</returns>
+        public int IndexOf(string columnName)
+        {
+            if (String.IsNullOrEmpty(columnName))
+            {
+                throw new ArgumentNullException("columnName");
+            }
+
+            for (int index = 0; index < this.columns.Count; index++)
+            {
+                if (this.columns[index].Name == columnName)
+                {
+                    return index;
+                }
+            }
+            return -1;
+        }
+
+        /// <summary>
+        /// Copies the columns from this collection into an array.
+        /// </summary>
+        /// <param name="array">destination array to be filed</param>
+        /// <param name="arrayIndex">offset into the destination array where copying begins</param>
+        public void CopyTo(ColumnInfo[] array, int arrayIndex)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            this.columns.CopyTo(array, arrayIndex);
+        }
+
+        /// <summary>
+        /// Not supported because the collection is read-only.
+        /// </summary>
+        /// <param name="column">column to remove</param>
+        /// <returns>true if the column was removed, false if it was not found</returns>
+        /// <exception cref="InvalidOperationException">the collection is read-only</exception>
+        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "column")]
+        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic")]
+        bool ICollection<ColumnInfo>.Remove(ColumnInfo column)
+        {
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Gets an enumerator over the columns in the collection.
+        /// </summary>
+        /// <returns>An enumerator of ColumnInfo objects.</returns>
+        public IEnumerator<ColumnInfo> GetEnumerator()
+        {
+            return this.columns.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Gets a string suitable for printing all the values of a record containing these columns.
+        /// </summary>
+        public string FormatString
+        {
+            get
+            {
+                if (this.formatString == null)
+                {
+                    this.formatString = CreateFormatString(this.columns);
+                }
+                return this.formatString;
+            }
+        }
+
+        private static string CreateFormatString(IList<ColumnInfo> columns)
+        {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < columns.Count; i++)
+            {
+                if (columns[i].Type == typeof(Stream))
+                {
+                    sb.AppendFormat("{0} = [Binary Data]", columns[i].Name);
+                }
+                else
+                {
+                    sb.AppendFormat("{0} = [{1}]", columns[i].Name, i + 1);
+                }
+
+                if (i < columns.Count - 1)
+                {
+                    sb.Append(", ");
+                }
+            }
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Gets an enumerator over the columns in the collection.
+        /// </summary>
+        /// <returns>An enumerator of ColumnInfo objects.</returns>
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Creates ColumnInfo objects for the associated view.
+        /// </summary>
+        /// <returns>dynamically-generated list of columns</returns>
+        private static IList<ColumnInfo> GetViewColumns(View view)
+        {
+            IList<string> columnNames = ColumnCollection.GetViewColumns(view, false);
+            IList<string> columnTypes = ColumnCollection.GetViewColumns(view, true);
+
+            int count = columnNames.Count;
+            if (columnTypes[count - 1] == "O0")
+            {
+                // Weird.. the "_Tables" table returns a second column with type "O0" -- ignore it.
+                count--;
+            }
+
+            IList<ColumnInfo> columnsList = new List<ColumnInfo>(count);
+            for (int i = 0; i < count; i++)
+            {
+                columnsList.Add(new ColumnInfo(columnNames[i], columnTypes[i]));
+            }
+
+            return columnsList;
+        }
+
+        /// <summary>
+        /// Gets a list of column names or column-definition-strings for the
+        /// associated view.
+        /// </summary>
+        /// <param name="view">the view to that defines the columns</param>
+        /// <param name="types">true to return types (column definition strings),
+        /// false to return names</param>
+        /// <returns>list of column names or types</returns>
+        private static IList<string> GetViewColumns(View view, bool types)
+        {
+            int recordHandle;
+            int typesFlag = types ? 1 : 0;
+            uint ret = RemotableNativeMethods.MsiViewGetColumnInfo(
+                (int) view.Handle, (uint) typesFlag, out recordHandle);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+
+            using (Record rec = new Record((IntPtr) recordHandle, true, null))
+            {
+                int count = rec.FieldCount;
+                IList<string> columnsList = new List<string>(count);
+
+                // Since we must be getting all strings of limited length, 
+                // this code is faster than calling rec.GetString(field).
+                for (int field = 1; field <= count; field++)
+                {
+                    uint bufSize = 256;
+                    StringBuilder buf = new StringBuilder((int) bufSize);
+                    ret = RemotableNativeMethods.MsiRecordGetString((int) rec.Handle, (uint) field, buf, ref bufSize);
+                    if (ret != 0)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                    columnsList.Add(buf.ToString());
+                }
+                return columnsList;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/ColumnEnums.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/ColumnEnums.cs
new file mode 100644
index 00000000..ad0a945b
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/ColumnEnums.cs
@@ -0,0 +1,689 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+
+    // Enumerations are in alphabetical order.
+
+    /// <summary>
+    /// Available values for the Attributes column of the Component table.
+    /// </summary>
+    [Flags]
+    public enum ComponentAttributes : int
+    {
+        /// <summary>
+        /// Local only - Component cannot be run from source. 
+        /// </summary>
+        /// <remarks><p>
+        /// Set this value for all components belonging to a feature to prevent the feature from being run-from-network or
+        /// run-from-source. Note that if a feature has no components, the feature always shows run-from-source and
+        /// run-from-my-computer as valid options.
+        /// </p></remarks>
+        None              = 0x0000,
+
+        /// <summary>
+        /// Component can only be run from source.
+        /// </summary>
+        /// <remarks><p>
+        /// Set this bit for all components belonging to a feature to prevent the feature from being run-from-my-computer.
+        /// Note that if a feature has no components, the feature always shows run-from-source and run-from-my-computer
+        /// as valid options.
+        /// </p></remarks>
+        SourceOnly        = 0x0001,
+
+        /// <summary>
+        /// Component can run locally or from source.
+        /// </summary>
+        Optional          = 0x0002,
+
+        /// <summary>
+        /// If this bit is set, the value in the KeyPath column is used as a key into the Registry table.
+        /// </summary>
+        /// <remarks><p>
+        /// If the Value field of the corresponding record in the Registry table is null, the Name field in that record
+        /// must not contain "+", "-", or "*". For more information, see the description of the Name field in Registry
+        /// table.
+        /// <p>Setting this bit is recommended for registry entries written to the HKCU hive. This ensures the installer
+        /// writes the necessary HKCU registry entries when there are multiple users on the same machine.</p>
+        /// </p></remarks>
+        RegistryKeyPath   = 0x0004,
+
+        /// <summary>
+        /// If this bit is set, the installer increments the reference count in the shared DLL registry of the component's
+        /// key file. If this bit is not set, the installer increments the reference count only if the reference count
+        /// already exists.
+        /// </summary>
+        SharedDllRefCount = 0x0008,
+
+        /// <summary>
+        /// If this bit is set, the installer does not remove the component during an uninstall. The installer registers
+        /// an extra system client for the component in the Windows Installer registry settings.
+        /// </summary>
+        Permanent         = 0x0010,
+
+        /// <summary>
+        /// If this bit is set, the value in the KeyPath column is a key into the ODBCDataSource table.
+        /// </summary>
+        OdbcDataSource    = 0x0020,
+
+        /// <summary>
+        /// If this bit is set, the installer reevaluates the value of the statement in the Condition column upon a reinstall.
+        /// If the value was previously False and has changed to true, the installer installs the component. If the value
+        /// was previously true and has changed to false, the installer removes the component even if the component has
+        /// other products as clients.
+        /// </summary>
+        Transitive        = 0x0040,
+
+        /// <summary>
+        /// If this bit is set, the installer does not install or reinstall the component if a key path file or a key path
+        /// registry entry for the component already exists. The application does register itself as a client of the component.
+        /// </summary>
+        /// <remarks><p>
+        /// Use this flag only for components that are being registered by the Registry table. Do not use this flag for
+        /// components registered by the AppId, Class, Extension, ProgId, MIME, and Verb tables.
+        /// </p></remarks>
+        NeverOverwrite    = 0x0080,
+
+        /// <summary>
+        /// Set this bit to mark this as a 64-bit component. This attribute facilitates the installation of packages that
+        /// include both 32-bit and 64-bit components. If this bit is not set, the component is registered as a 32-bit component.
+        /// </summary>
+        /// <remarks><p>
+        /// If this is a 64-bit component replacing a 32-bit component, set this bit and assign a new GUID in the
+        /// ComponentId column.
+        /// </p></remarks>
+        SixtyFourBit      = 0x0100,
+
+        /// <summary>
+        /// Set this bit to disable registry reflection on all existing and new registry keys affected by this component.
+        /// </summary>
+        /// <remarks><p>
+        /// If this bit is set, the Windows Installer calls the RegDisableReflectionKey on each key being accessed by the component.
+        /// This bit is available with Windows Installer version 4.0 and is ignored on 32-bit systems.
+        /// </p></remarks>
+        DisableRegistryReflection = 0x0200,
+
+        /// <summary>
+        /// [MSI 4.5] Set this bit for a component in a patch package to prevent leaving orphan components on the computer.
+        /// </summary>
+        /// <remarks><p>
+        /// If a subsequent patch is installed, marked with the SupersedeEarlier flag in its MsiPatchSequence
+        /// table to supersede the first patch, Windows Installer 4.5 can unregister and uninstall components marked with the
+        /// UninstallOnSupersedence value. If the component is not marked with this bit, installation of a superseding patch can leave
+        /// behind an unused component on the computer.
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Supersedence")]
+        UninstallOnSupersedence = 0x0400,
+
+        /// <summary>
+        /// [MSI 4.5] If a component is marked with this attribute value in at least one package installed on the system,
+        /// the installer treats the component as marked in all packages. If a package that shares the marked component
+        /// is uninstalled, Windows Installer 4.5 can continue to share the highest version of the component on the system,
+        /// even if that highest version was installed by the package that is being uninstalled.
+        /// </summary>
+        Shared = 0x0800,
+    }
+
+    /// <summary>
+    /// Defines flags for the Attributes column of the Control table.
+    /// </summary>
+    [Flags]
+    public enum ControlAttributes : int
+    {
+        /// <summary>If this bit is set, the control is visible on the dialog box.</summary>
+        Visible           = 0x00000001,
+
+        /// <summary>specifies if the given control is enabled or disabled. Most controls appear gray when disabled.</summary>
+        Enabled           = 0x00000002,
+
+        /// <summary>If this bit is set, the control is displayed with a sunken, three dimensional look.</summary>
+        Sunken            = 0x00000004,
+
+        /// <summary>The Indirect control attribute specifies whether the value displayed or changed by this control is referenced indirectly.</summary>
+        Indirect          = 0x00000008,
+
+        /// <summary>If this bit is set on a control, the associated property specified in the Property column of the Control table is an integer.</summary>
+        Integer           = 0x00000010,
+
+        /// <summary>If this bit is set the text in the control is displayed in a right-to-left reading order.</summary>
+        RightToLeftReadingOrder = 0x00000020,
+
+        /// <summary>If this style bit is set, text in the control is aligned to the right.</summary>
+        RightAligned      = 0x00000040,
+
+        /// <summary>If this bit is set, the scroll bar is located on the left side of the control, otherwise it is on the right.</summary>
+        LeftScroll        = 0x00000080,
+
+        /// <summary>This is a combination of the RightToLeftReadingOrder, RightAligned, and LeftScroll attributes.</summary>
+        Bidirectional     = RightToLeftReadingOrder | RightAligned | LeftScroll,
+    
+        /// <summary>If this bit is set on a text control, the control is displayed transparently with the background showing through the control where there are no characters.</summary>
+        Transparent       = 0x00010000,
+
+        /// <summary>If this bit is set on a text control, the occurrence of the character "&amp;" in a text string is displayed as itself.</summary>
+        NoPrefix          = 0x00020000,
+
+        /// <summary>If this bit is set the text in the control is displayed on a single line.</summary>
+        NoWrap            = 0x00040000,
+
+        /// <summary>If this bit is set for a text control, the control will automatically attempt to format the displayed text as a number representing a count of bytes.</summary>
+        FormatSize        = 0x00080000,
+
+        /// <summary>If this bit is set, fonts are created using the user's default UI code page. Otherwise it is created using the database code page.</summary>
+        UsersLanguage     = 0x00100000,
+
+        /// <summary>If this bit is set on an Edit control, the installer creates a multiple line edit control with a vertical scroll bar.</summary>
+        Multiline         = 0x00010000,
+
+        /// <summary>This attribute creates an edit control for entering passwords. The control displays each character as an asterisk (*) as they are typed into the control.</summary>
+        PasswordInput     = 0x00200000,
+    
+        /// <summary>If this bit is set on a ProgressBar control, the bar is drawn as a series of small rectangles in Microsoft Windows 95-style. Otherwise it is drawn as a single continuous rectangle.</summary>
+        Progress95        = 0x00010000,
+    
+        /// <summary>If this bit is set, the control shows removable volumes.</summary>
+        RemovableVolume   = 0x00010000,
+
+        /// <summary>If this bit is set, the control shows fixed internal hard drives.</summary>
+        FixedVolume       = 0x00020000,
+
+        /// <summary>If this bit is set, the control shows remote volumes.</summary>
+        RemoteVolume      = 0x00040000,
+
+        /// <summary>If this bit is set, the control shows CD-ROM volumes.</summary>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Cdrom")]
+        CdromVolume       = 0x00080000,
+
+        /// <summary>If this bit is set, the control shows RAM disk volumes.</summary>
+        RamDiskVolume     = 0x00100000,
+
+        /// <summary>If this bit is set, the control shows floppy volumes.</summary>
+        FloppyVolume      = 0x00200000,
+        
+        /// <summary>Specifies whether or not the rollback backup files are included in the costs displayed by the VolumeCostList control.</summary>
+        ShowRollbackCost  = 0x00400000,
+    
+        /// <summary>If this bit is set, the items listed in the control are displayed in a specified order. Otherwise, items are displayed in alphabetical order.</summary>
+        Sorted            = 0x00010000,
+
+        /// <summary>If this bit is set on a combo box, the edit field is replaced by a static text field. This prevents a user from entering a new value and requires the user to choose only one of the predefined values.</summary>
+        ComboList         = 0x00020000,
+    
+        //ImageHandle       = 0x00010000,
+
+        /// <summary>If this bit is set on a check box or a radio button group, the button is drawn with the appearance of a push button, but its logic stays the same.</summary>
+        PushLike          = 0x00020000,
+
+        /// <summary>If this bit is set, the text in the control is replaced by a bitmap image. The Text column in the Control table is a foreign key into the Binary table.</summary>
+        Bitmap            = 0x00040000,
+
+        /// <summary>If this bit is set, text is replaced by an icon image and the Text column in the Control table is a foreign key into the Binary table.</summary>
+        Icon              = 0x00080000,
+
+        /// <summary>If this bit is set, the picture is cropped or centered in the control without changing its shape or size.</summary>
+        FixedSize         = 0x00100000,
+
+        /// <summary>Specifies which size of the icon image to load. If none of the bits are set, the first image is loaded.</summary>
+        IconSize16        = 0x00200000,
+
+        /// <summary>Specifies which size of the icon image to load. If none of the bits are set, the first image is loaded.</summary>
+        IconSize32        = 0x00400000,
+
+        /// <summary>Specifies which size of the icon image to load. If none of the bits are set, the first image is loaded.</summary>
+        IconSize48        = 0x00600000,
+
+        /// <summary>If this bit is set, and the installation is not yet running with elevated privileges, the control is created with a UAC icon.</summary>
+        ElevationShield   = 0x00800000,
+
+        /// <summary>If this bit is set, the RadioButtonGroup has text and a border displayed around it.</summary>
+        HasBorder         = 0x01000000,
+    }
+
+    /// <summary>
+    /// Defines flags for the Type column of the CustomAction table.
+    /// </summary>
+    [SuppressMessage("Microsoft.Usage", "CA2217:DoNotMarkEnumsWithFlags")]
+    [Flags]
+    public enum CustomActionTypes : int
+    {
+        /// <summary>Unspecified custom action type.</summary>
+        None               = 0x0000,
+
+        /// <summary>Target = entry point name</summary>
+        Dll                = 0x0001,
+
+        /// <summary>Target = command line args</summary>
+        Exe                = 0x0002,
+
+        /// <summary>Target = text string to be formatted and set into property</summary>
+        TextData           = 0x0003,
+
+        /// <summary>Target = entry point name, null if none to call</summary>
+        JScript            = 0x0005,
+
+        /// <summary>Target = entry point name, null if none to call</summary>
+        VBScript           = 0x0006,
+
+        /// <summary>Target = property list for nested engine initialization</summary>
+        Install            = 0x0007,
+
+        /// <summary>Source = File.File, file part of installation</summary>
+        SourceFile         = 0x0010,
+
+        /// <summary>Source = Directory.Directory, folder containing existing file</summary>
+        Directory          = 0x0020,
+
+        /// <summary>Source = Property.Property, full path to executable</summary>
+        Property           = 0x0030,
+
+        /// <summary>Ignore action return status, continue running</summary>
+        Continue           = 0x0040,
+
+        /// <summary>Run asynchronously</summary>
+        Async              = 0x0080,
+
+        /// <summary>Skip if UI sequence already run</summary>
+        FirstSequence      = 0x0100,
+
+        /// <summary>Skip if UI sequence already run in same process</summary>
+        OncePerProcess     = 0x0200,
+
+        /// <summary>Run on client only if UI already run on client</summary>
+        ClientRepeat       = 0x0300,
+
+        /// <summary>Queue for execution within script</summary>
+        InScript           = 0x0400,
+
+        /// <summary>In conjunction with InScript: queue in Rollback script</summary>
+        Rollback           = 0x0100,
+
+        /// <summary>In conjunction with InScript: run Commit ops from script on success</summary>
+        Commit             = 0x0200,
+
+        /// <summary>No impersonation, run in system context</summary>
+        NoImpersonate      = 0x0800,
+
+        /// <summary>Impersonate for per-machine installs on TS machines</summary>
+        TSAware            = 0x4000,
+
+        /// <summary>Script requires 64bit process</summary>
+        SixtyFourBitScript = 0x1000,
+
+        /// <summary>Don't record the contents of the Target field in the log file</summary>
+        HideTarget         = 0x2000,
+
+        /// <summary>The custom action runs only when a patch is being uninstalled</summary>
+        PatchUninstall     = 0x8000,
+    }
+
+    /// <summary>
+    /// Defines flags for the Attributes column of the Dialog table.
+    /// </summary>
+    [Flags]
+    public enum DialogAttributes : int
+    {
+        /// <summary>If this bit is set, the dialog is originally created as visible, otherwise it is hidden.</summary>
+        Visible          = 0x00000001,
+
+        /// <summary>If this bit is set, the dialog box is modal, other dialogs of the same application cannot be put on top of it, and the dialog keeps the control while it is running.</summary>
+        Modal            = 0x00000002,
+
+        /// <summary>If this bit is set, the dialog box can be minimized. This bit is ignored for modal dialog boxes, which cannot be minimized.</summary>
+        Minimize         = 0x00000004,
+
+        /// <summary>If this style bit is set, the dialog box will stop all other applications and no other applications can take the focus.</summary>
+        SysModal         = 0x00000008,
+
+        /// <summary>If this bit is set, the other dialogs stay alive when this dialog box is created.</summary>
+        KeepModeless     = 0x00000010,
+
+        /// <summary>If this bit is set, the dialog box periodically calls the installer. If the property changes, it notifies the controls on the dialog.</summary>
+        TrackDiskSpace   = 0x00000020,
+
+        /// <summary>If this bit is set, the pictures on the dialog box are created with the custom palette (one per dialog received from the first control created).</summary>
+        UseCustomPalette = 0x00000040,
+
+        /// <summary>If this style bit is set the text in the dialog box is displayed in right-to-left-reading order.</summary>
+        RightToLeftReadingOrder  = 0x00000080,
+
+        /// <summary>If this style bit is set, the text is aligned on the right side of the dialog box.</summary>
+        RightAligned     = 0x00000100,
+
+        /// <summary>If this style bit is set, the scroll bar is located on the left side of the dialog box.</summary>
+        LeftScroll       = 0x00000200,
+
+        /// <summary>This is a combination of the RightToLeftReadingOrder, RightAligned, and the LeftScroll dialog style bits.</summary>
+        Bidirectional    = RightToLeftReadingOrder | RightAligned | LeftScroll,
+
+        /// <summary>If this bit is set, the dialog box is an error dialog.</summary>
+        Error            = 0x00010000,
+    }
+
+    /// <summary>
+    /// Available values for the Attributes column of the Feature table.
+    /// </summary>
+    [Flags]
+    public enum FeatureAttributes : int
+    {
+        /// <summary>
+        /// Favor local - Components of this feature that are not marked for installation from source are installed locally.
+        /// </summary>
+        /// <remarks><p>
+        /// A component shared by two or more features, some of which are set to FavorLocal and some to FavorSource,
+        /// is installed locally. Components marked <see cref="ComponentAttributes.SourceOnly"/> in the Component
+        /// table are always run from the source CD/server. The bits FavorLocal and FavorSource work with features not
+        /// listed by the ADVERTISE property.
+        /// </p></remarks>
+        None                   = 0x0000,
+
+        /// <summary>
+        /// Components of this feature not marked for local installation are installed to run from the source
+        /// CD-ROM or server.
+        /// </summary>
+        /// <remarks><p>
+        /// A component shared by two or more features, some of which are set to FavorLocal and some to FavorSource,
+        /// is installed to run locally. Components marked <see cref="ComponentAttributes.None"/> (local-only) in the
+        /// Component table are always installed locally. The bits FavorLocal and FavorSource work with features
+        /// not listed by the ADVERTISE property.
+        /// </p></remarks>
+        FavorSource            = 0x0001,
+
+        /// <summary>
+        /// Set this attribute and the state of the feature is the same as the state of the feature's parent.
+        /// You cannot use this option if the feature is located at the root of a feature tree.
+        /// </summary>
+        /// <remarks><p>
+        /// Omit this attribute and the feature state is determined according to DisallowAdvertise and
+        /// FavorLocal and FavorSource.
+        /// <p>To guarantee that the child feature's state always follows the state of its parent, even when the
+        /// child and parent are initially set to absent in the SelectionTree control, you must include both
+        /// FollowParent and UIDisallowAbsent in the attributes of the child feature.</p>
+        /// <p>Note that if you set FollowParent without setting UIDisallowAbsent, the installer cannot force
+        /// the child feature out of the absent state. In this case, the child feature matches the parent's
+        /// installation state only if the child is set to something other than absent.</p>
+        /// <p>Set FollowParent and UIDisallowAbsent to ensure a child feature follows the state of the parent feature.</p>
+        /// </p></remarks>
+        FollowParent           = 0x0002,
+
+        /// <summary>
+        /// Set this attribute and the feature state is Advertise.
+        /// </summary>
+        /// <remarks><p>
+        /// If the feature is listed by the ADDDEFAULT property this bit is ignored and the feature state is determined
+        /// according to FavorLocal and FavorSource.
+        /// <p>Omit this attribute and the feature state is determined according to DisallowAdvertise and FavorLocal
+        /// and FavorSource.</p>
+        /// </p></remarks>
+        FavorAdvertise         = 0x0004,
+
+        /// <summary>
+        /// Set this attribute to prevent the feature from being advertised.
+        /// </summary>
+        /// <remarks><p>
+        /// Note that this bit works only with features that are listed by the ADVERTISE property.
+        /// <p>Set this attribute and if the listed feature is not a parent or child, the feature is installed according to
+        /// FavorLocal and FavorSource.</p>
+        /// <p>Set this attribute for the parent of a listed feature and the parent is installed.</p>
+        /// <p>Set this attribute for the child of a listed feature and the state of the child is Absent.</p>
+        /// <p>Omit this attribute and if the listed feature is not a parent or child, the feature state is Advertise.</p>
+        /// <p>Omit this attribute and if the listed feature is a parent or child, the state of both features is Advertise.</p>
+        /// </p></remarks>
+        DisallowAdvertise      = 0x0008,
+
+        /// <summary>
+        /// Set this attribute and the user interface does not display an option to change the feature state
+        /// to Absent. Setting this attribute forces the feature to the installation state, whether or not the
+        /// feature is visible in the UI.
+        /// </summary>
+        /// <remarks><p>
+        /// Omit this attribute and the user interface displays an option to change the feature state to Absent.
+        /// <p>Set FollowParent and UIDisallowAbsent to ensure a child feature follows the state of the parent feature.</p>
+        /// <p>Setting this attribute not only affects the UI, but also forces the feature to the install state whether
+        /// the feature is visible in the UI or not.</p>
+        /// </p></remarks>
+        UIDisallowAbsent       = 0x0010,
+
+        /// <summary>
+        /// Set this attribute and advertising is disabled for the feature if the operating system shell does not
+        /// support Windows Installer descriptors. 
+        /// </summary>
+        NoUnsupportedAdvertise = 0x0020,
+    }
+
+    /// <summary>
+    /// Available values for the Attributes column of the File table.
+    /// </summary>
+    [Flags]
+    public enum FileAttributes : int
+    {
+        /// <summary>No attributes.</summary>
+        None          = 0x0000,
+
+        /// <summary>Read-only.</summary>
+        ReadOnly      = 0x0001,
+
+        /// <summary>Hidden.</summary>
+        Hidden        = 0x0002,
+
+        /// <summary>System.</summary>
+        System        = 0x0004,
+
+        /// <summary>The file is vital for the proper operation of the component to which it belongs.</summary>
+        Vital         = 0x0200,
+
+        /// <summary>The file contains a valid checksum. A checksum is required to repair a file that has become corrupted.</summary>
+        Checksum      = 0x0400,
+
+        /// <summary>This bit must only be added by a patch and if the file is being added by the patch.</summary>
+        PatchAdded    = 0x1000,
+
+        /// <summary>
+        /// The file's source type is uncompressed. If set, ignore the WordCount summary information property. If neither
+        /// Noncompressed nor Compressed are set, the compression state of the file is specified by the WordCount summary
+        /// information property. Do not set both Noncompressed and Compressed.
+        /// </summary>
+        NonCompressed = 0x2000,
+
+        /// <summary>
+        /// The file's source type is compressed. If set, ignore the WordCount summary information property. If neither
+        /// Noncompressed or Compressed are set, the compression state of the file is specified by the WordCount summary
+        /// information property. Do not set both Noncompressed and Compressed.
+        /// </summary>
+        Compressed    = 0x4000,
+    }
+
+    /// <summary>
+    /// Defines values for the Action column of the IniFile and RemoveIniFile tables.
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ini")]
+    public enum IniFileAction : int
+    {
+        /// <summary>Creates or updates a .ini entry.</summary>
+        AddLine    = 0,
+
+        /// <summary>Creates a .ini entry only if the entry does not already exist.</summary>
+        CreateLine = 1,
+
+        /// <summary>Deletes .ini entry.</summary>
+        RemoveLine = 2,
+
+        /// <summary>Creates a new entry or appends a new comma-separated value to an existing entry.</summary>
+        AddTag     = 3,
+
+        /// <summary>Deletes a tag from a .ini entry.</summary>
+        RemoveTag  = 4,
+    }
+
+    /// <summary>
+    /// Defines values for the Type column of the CompLocator, IniLocator, and RegLocator tables.
+    /// </summary>
+    [Flags]
+    [SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue")]
+    public enum LocatorTypes : int
+    {
+        /// <summary>Key path is a directory.</summary>
+        Directory    = 0x00000000,
+
+        /// <summary>Key path is a file name.</summary>
+        FileName     = 0x00000001,
+
+        /// <summary>Key path is a registry value.</summary>
+        RawValue     = 0x00000002,
+
+        /// <summary>Set this bit to have the installer search the 64-bit portion of the registry.</summary>
+        SixtyFourBit = 0x00000010,
+    }
+
+    /// <summary>
+    /// Defines values for the Root column of the Registry, RemoveRegistry, and RegLocator tables.
+    /// </summary>
+    public enum RegistryRoot : int
+    {
+        /// <summary>HKEY_CURRENT_USER for a per-user installation,
+        /// or HKEY_LOCAL_MACHINE for a per-machine installation.</summary>
+        UserOrMachine = -1,
+
+        /// <summary>HKEY_CLASSES_ROOT</summary>
+        ClassesRoot   = 0,
+
+        /// <summary>HKEY_CURRENT_USER</summary>
+        CurrentUser   = 1,
+
+        /// <summary>HKEY_LOCAL_MACHINE</summary>
+        LocalMachine  = 2,
+
+        /// <summary>HKEY_USERS</summary>
+        Users         = 3,
+    }
+
+    /// <summary>
+    /// Defines values for the InstallMode column of the RemoveFile table.
+    /// </summary>
+    [Flags]
+    public enum RemoveFileModes : int
+    {
+        /// <summary>Never remove.</summary>
+        None      = 0,
+
+        /// <summary>Remove when the associated component is being installed (install state = local or source).</summary>
+        OnInstall = 1,
+
+        /// <summary>Remove when the associated component is being removed (install state = absent).</summary>
+        OnRemove  = 2,
+    }
+
+    /// <summary>
+    /// Defines values for the ServiceType, StartType, and ErrorControl columns of the ServiceInstall table.
+    /// </summary>
+    [Flags]
+    public enum ServiceAttributes : int
+    {
+        /// <summary>No flags.</summary>
+        None = 0,
+
+        /// <summary>A Win32 service that runs its own process.</summary>
+        OwnProcess        = 0x0010,
+
+        /// <summary>A Win32 service that shares a process.</summary>
+        ShareProcess      = 0x0020,
+
+        /// <summary>A Win32 service that interacts with the desktop.
+        /// This value cannot be used alone and must be added to either
+        /// <see cref="OwnProcess"/> or <see cref="ShareProcess"/>.</summary>
+        Interactive       = 0x0100,
+
+        /// <summary>Service starts during startup of the system.</summary>
+        AutoStart         = 0x0002,
+
+        /// <summary>Service starts when the service control manager calls the StartService function.</summary>
+        DemandStart       = 0x0003,
+
+        /// <summary>Specifies a service that can no longer be started.</summary>
+        Disabled          = 0x0004,
+
+        /// <summary>Logs the error, displays a message box and continues the startup operation.</summary>
+        ErrorMessage      = 0x0001,
+
+        /// <summary>Logs the error if it is possible and the system is restarted with the last configuration
+        /// known to be good. If the last-known-good configuration is being started, the startup operation fails.</summary>
+        ErrorCritical     = 0x0003,
+
+        /// <summary>When combined with other error flags, specifies that the overall install should fail if
+        /// the service cannot be installed into the system.</summary>
+        ErrorControlVital = 0x8000,
+    }
+
+    /// <summary>
+    /// Defines values for the Event column of the ServiceControl table.
+    /// </summary>
+    [Flags]
+    public enum ServiceControlEvents : int
+    {
+        /// <summary>No control events.</summary>
+        None            = 0x0000,
+
+        /// <summary>During an install, starts the service during the StartServices action.</summary>
+        Start           = 0x0001,
+
+        /// <summary>During an install, stops the service during the StopServices action.</summary>
+        Stop            = 0x0002,
+
+        /// <summary>During an install, deletes the service during the DeleteServices action.</summary>
+        Delete          = 0x0008,
+
+        /// <summary>During an uninstall, starts the service during the StartServices action.</summary>
+        UninstallStart  = 0x0010,
+
+        /// <summary>During an uninstall, stops the service during the StopServices action.</summary>
+        UninstallStop   = 0x0020,
+
+        /// <summary>During an uninstall, deletes the service during the DeleteServices action.</summary>
+        UninstallDelete = 0x0080,
+    }
+
+    /// <summary>
+    /// Defines values for the StyleBits column of the TextStyle table.
+    /// </summary>
+    [Flags]
+    public enum TextStyles : int
+    {
+        /// <summary>Bold</summary>
+        Bold      = 0x0001,
+
+        /// <summary>Italic</summary>
+        Italic    = 0x0002,
+
+        /// <summary>Underline</summary>
+        Underline = 0x0004,
+
+        /// <summary>Strike out</summary>
+        Strike    = 0x0008,
+    }
+
+    /// <summary>
+    /// Defines values for the Attributes column of the Upgrade table.
+    /// </summary>
+    [Flags]
+    public enum UpgradeAttributes : int
+    {
+        /// <summary>Migrates feature states by enabling the logic in the MigrateFeatureStates action.</summary>
+        MigrateFeatures     = 0x0001,
+
+        /// <summary>Detects products and applications but does not remove.</summary>
+        OnlyDetect          = 0x0002,
+
+        /// <summary>Continues installation upon failure to remove a product or application.</summary>
+        IgnoreRemoveFailure = 0x0004,
+
+        /// <summary>Detects the range of versions including the value in VersionMin.</summary>
+        VersionMinInclusive = 0x0100,
+
+        /// <summary>Dectects the range of versions including the value in VersionMax.</summary>
+        VersionMaxInclusive = 0x0200,
+
+        /// <summary>Detects all languages, excluding the languages listed in the Language column.</summary>
+        LanguagesExclusive  = 0x0400,
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/ColumnInfo.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/ColumnInfo.cs
new file mode 100644
index 00000000..43363230
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/ColumnInfo.cs
@@ -0,0 +1,297 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Defines a single column of a table in an installer database.
+    /// </summary>
+    /// <remarks>Once created, a ColumnInfo object is immutable.</remarks>
+    public class ColumnInfo
+    {
+        private string name;
+        private Type type;
+        private int size;
+        private bool isRequired;
+        private bool isTemporary;
+        private bool isLocalizable;
+
+        /// <summary>
+        /// Creates a new ColumnInfo object from a column definition.
+        /// </summary>
+        /// <param name="name">name of the column</param>
+        /// <param name="columnDefinition">column definition string</param>
+        /// <seealso cref="ColumnDefinitionString"/>
+        public ColumnInfo(string name, string columnDefinition)
+            : this(name, typeof(String), 0, false, false, false)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException("name");
+            }
+
+            if (columnDefinition == null)
+            {
+                throw new ArgumentNullException("columnDefinition");
+            }
+
+            switch (Char.ToLower(columnDefinition[0], CultureInfo.InvariantCulture))
+            {
+                case 'i': this.type = typeof(Int32);
+                    break;
+                case 'j': this.type = typeof(Int32); this.isTemporary = true;
+                    break;
+                case 'g': this.type = typeof(String); this.isTemporary = true;
+                    break;
+                case 'l': this.type = typeof(String); this.isLocalizable = true;
+                    break;
+                case 'o': this.type = typeof(Stream); this.isTemporary = true;
+                    break;
+                case 's': this.type = typeof(String);
+                    break;
+                case 'v': this.type = typeof(Stream);
+                    break;
+                default: throw new InstallerException();
+            }
+
+            this.isRequired = Char.IsLower(columnDefinition[0]);
+            this.size = Int32.Parse(
+                columnDefinition.Substring(1),
+                CultureInfo.InvariantCulture.NumberFormat);
+            if (this.type == typeof(Int32) && this.size <= 2)
+            {
+                this.type = typeof(Int16);
+            }
+        }
+
+        /// <summary>
+        /// Creates a new ColumnInfo object from a list of parameters.
+        /// </summary>
+        /// <param name="name">name of the column</param>
+        /// <param name="type">type of the column; must be one of the following:
+        /// Int16, Int32, String, or Stream</param>
+        /// <param name="size">the maximum number of characters for String columns;
+        /// ignored for other column types</param>
+        /// <param name="isRequired">true if the column is required to have a non-null value</param>
+        public ColumnInfo(string name, Type type, int size, bool isRequired)
+            : this(name, type, size, isRequired, false, false)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new ColumnInfo object from a list of parameters.
+        /// </summary>
+        /// <param name="name">name of the column</param>
+        /// <param name="type">type of the column; must be one of the following:
+        /// Int16, Int32, String, or Stream</param>
+        /// <param name="size">the maximum number of characters for String columns;
+        /// ignored for other column types</param>
+        /// <param name="isRequired">true if the column is required to have a non-null value</param>
+        /// <param name="isTemporary">true to if the column is only in-memory and
+        /// not persisted with the database</param>
+        /// <param name="isLocalizable">for String columns, indicates the column
+        /// is localizable; ignored for other column types</param>
+        public ColumnInfo(string name, Type type, int size, bool isRequired, bool isTemporary, bool isLocalizable)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException("name");
+            }
+
+            if (type == typeof(Int32))
+            {
+                size = 4;
+                isLocalizable = false;
+            }
+            else if (type == typeof(Int16))
+            {
+                size = 2;
+                isLocalizable = false;
+            }
+            else if (type == typeof(String))
+            {
+            }
+            else if (type == typeof(Stream))
+            {
+                isLocalizable = false;
+            }
+            else
+            {
+                throw new ArgumentOutOfRangeException("type");
+            }
+
+            this.name = name;
+            this.type = type;
+            this.size = size;
+            this.isRequired = isRequired;
+            this.isTemporary = isTemporary;
+            this.isLocalizable = isLocalizable;
+        }
+
+        /// <summary>
+        /// Gets the name of the column.
+        /// </summary>
+        /// <value>name of the column</value>
+        public string Name
+        {
+            get { return this.name; }
+        }
+
+        /// <summary>
+        /// Gets the type of the column as a System.Type.  This is one of the following: Int16, Int32, String, or Stream
+        /// </summary>
+        /// <value>type of the column</value>
+        [SuppressMessage("Microsoft.Naming", "CA1721:PropertyNamesShouldNotMatchGetMethods")]
+        public Type Type
+        {
+            get { return this.type; }
+        }
+
+        /// <summary>
+        /// Gets the type of the column as an integer that can be cast to a System.Data.DbType.  This is one of the following: Int16, Int32, String, or Binary
+        /// </summary>
+        /// <value>equivalent DbType of the column as an integer</value>
+        public int DBType
+        {
+            get
+            {
+                if (this.type == typeof(Int16)) return 10;
+                else if (this.type == typeof(Int32)) return 11;
+                else if (this.type == typeof(Stream)) return 1;
+                else return 16;
+            }
+        }
+
+        /// <summary>
+        /// Gets the size of the column.
+        /// </summary>
+        /// <value>The size of integer columns this is either 2 or 4.  For string columns this is the maximum
+        /// recommended length of the string, or 0 for unlimited length.  For stream columns, 0 is returned.</value>
+        public int Size
+        {
+            get { return this.size; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the column must be non-null when inserting a record.
+        /// </summary>
+        /// <value>required status of the column</value>
+        public bool IsRequired
+        {
+            get { return this.isRequired; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the column is temporary. Temporary columns are not persisted
+        /// when the database is saved to disk.
+        /// </summary>
+        /// <value>temporary status of the column</value>
+        public bool IsTemporary
+        {
+            get { return this.isTemporary; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the column is a string column that is localizable.
+        /// </summary>
+        /// <value>localizable status of the column</value>
+        public bool IsLocalizable
+        {
+            get { return this.isLocalizable; }
+        }
+
+        /// <summary>
+        /// Gets an SQL fragment that can be used to create this column within a CREATE TABLE statement.
+        /// </summary>
+        /// <value>SQL fragment to be used for creating the column</value>
+        /// <remarks><p>
+        /// Examples:
+        /// <list type="bullet">
+        /// <item>LONG</item>
+        /// <item>SHORT TEMPORARY</item>
+        /// <item>CHAR(0) LOCALIZABLE</item>
+        /// <item>CHAR(72) NOT NULL LOCALIZABLE</item>
+        /// <item>OBJECT</item>
+        /// </list>
+        /// </p></remarks>
+        public string SqlCreateString
+        {
+            get
+            {
+                StringBuilder s = new StringBuilder();
+                s.AppendFormat("`{0}` ", this.name);
+                if (this.type == typeof(Int16)) s.Append("SHORT");
+                else if (this.type == typeof(Int32)) s.Append("LONG");
+                else if (this.type == typeof(String)) s.AppendFormat("CHAR({0})", this.size);
+                else s.Append("OBJECT");
+                if (this.isRequired) s.Append(" NOT NULL");
+                if (this.isTemporary) s.Append(" TEMPORARY");
+                if (this.isLocalizable) s.Append(" LOCALIZABLE");
+                return s.ToString();
+            }
+        }
+
+        /// <summary>
+        /// Gets a short string defining the type and size of the column. 
+        /// </summary>
+        /// <value>
+        /// The definition string consists
+        /// of a single letter representing the data type followed by the width of the column (in characters
+        /// when applicable, bytes otherwise). A width of zero designates an unbounded width (for example,
+        /// long text fields and streams). An uppercase letter indicates that null values are allowed in
+        /// the column.
+        /// </value>
+        /// <remarks><p>
+        /// <list>
+        /// <item>s? - String, variable length (?=1-255)</item>
+        /// <item>s0 - String, variable length</item>
+        /// <item>i2 - Short integer</item>
+        /// <item>i4 - Long integer</item>
+        /// <item>v0 - Binary Stream</item>
+        /// <item>g? - Temporary string (?=0-255)</item>
+        /// <item>j? - Temporary integer (?=0,1,2,4)</item>
+        /// <item>O0 - Temporary object (stream)</item>
+        /// <item>l? - Localizable string, variable length (?=1-255)</item>
+        /// <item>l0 - Localizable string, variable length</item>
+        /// </list>
+        /// </p></remarks>
+        public string ColumnDefinitionString
+        {
+            get
+            {
+                char t;
+                if (this.type == typeof(Int16) || this.type == typeof(Int32))
+                {
+                    t = (this.isTemporary ? 'j' : 'i');
+                }
+                else if (this.type == typeof(String))
+                {
+                    t = (this.isTemporary ? 'g' : this.isLocalizable ? 'l' : 's');
+                }
+                else
+                {
+                    t = (this.isTemporary ? 'O' : 'v');
+                }
+                return String.Format(
+                    CultureInfo.InvariantCulture,
+                    "{0}{1}",
+                    (this.isRequired ? t : Char.ToUpper(t, CultureInfo.InvariantCulture)),
+                    this.size);
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the column.
+        /// </summary>
+        /// <returns>Name of the column.</returns>
+        public override string ToString()
+        {
+            return this.Name;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/ComponentInfo.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/ComponentInfo.cs
new file mode 100644
index 00000000..af27fd1d
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/ComponentInfo.cs
@@ -0,0 +1,276 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Collections;
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Accessor for information about components within the context of an installation session.
+    /// </summary>
+    public sealed class ComponentInfoCollection : ICollection<ComponentInfo>
+    {
+        private Session session;
+
+        internal ComponentInfoCollection(Session session)
+        {
+            this.session = session;
+        }
+
+        /// <summary>
+        /// Gets information about a component within the context of an installation session.
+        /// </summary>
+        /// <param name="component">name of the component</param>
+        /// <returns>component object</returns>
+        public ComponentInfo this[string component]
+        {
+            get
+            {
+                return new ComponentInfo(this.session, component);
+            }
+        }
+
+        void ICollection<ComponentInfo>.Add(ComponentInfo item)
+        {
+            throw new InvalidOperationException();
+        }
+
+        void ICollection<ComponentInfo>.Clear()
+        {
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Checks if the collection contains a component.
+        /// </summary>
+        /// <param name="component">name of the component</param>
+        /// <returns>true if the component is in the collection, else false</returns>
+        public bool Contains(string component)
+        {
+            return this.session.Database.CountRows(
+                "Component", "`Component` = '" + component + "'") == 1;
+        }
+
+        bool ICollection<ComponentInfo>.Contains(ComponentInfo item)
+        {
+            return item != null && this.Contains(item.Name);
+        }
+
+        /// <summary>
+        /// Copies the features into an array.
+        /// </summary>
+        /// <param name="array">array that receives the features</param>
+        /// <param name="arrayIndex">offset into the array</param>
+        public void CopyTo(ComponentInfo[] array, int arrayIndex)
+        {
+            foreach (ComponentInfo component in this)
+            {
+                array[arrayIndex++] = component;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of components defined for the product.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return this.session.Database.CountRows("Component");
+            }
+        }
+
+        bool ICollection<ComponentInfo>.IsReadOnly
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        bool ICollection<ComponentInfo>.Remove(ComponentInfo item)
+        {
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Enumerates the components in the collection.
+        /// </summary>
+        /// <returns>an enumerator over all features in the collection</returns>
+        public IEnumerator<ComponentInfo> GetEnumerator()
+        {
+            using (View compView = this.session.Database.OpenView(
+                "SELECT `Component` FROM `Component`"))
+            {
+                compView.Execute();
+
+                foreach (Record compRec in compView) using (compRec)
+                {
+                    string comp = compRec.GetString(1);
+                    yield return new ComponentInfo(this.session, comp);
+                }
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+
+    /// <summary>
+    /// Provides access to information about a component within the context of an installation session.
+    /// </summary>
+    public class ComponentInfo
+    {
+        private Session session;
+        private string name;
+
+        internal ComponentInfo(Session session, string name)
+        {
+            this.session = session;
+            this.name = name;
+        }
+
+        /// <summary>
+        /// Gets the name of the component (primary key in the Component table).
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return this.name;
+            }
+        }
+
+        /// <summary>
+        /// Gets the current install state of the designated Component.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentException">an unknown Component was requested</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetcomponentstate.asp">MsiGetComponentState</a>
+        /// </p></remarks>
+        public InstallState CurrentState
+        {
+            get
+            {
+                int installedState, actionState;
+                uint ret = RemotableNativeMethods.MsiGetComponentState((int) this.session.Handle, this.name, out installedState, out actionState);
+                if (ret != 0)
+                {
+                    if (ret == (uint) NativeMethods.Error.UNKNOWN_COMPONENT)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret, this.name);
+                    }
+                    else
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                }
+                return (InstallState) installedState;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the action state of the designated Component.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentException">an unknown Component was requested</exception>
+        /// <exception cref="InstallCanceledException">the user exited the installation</exception>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetcomponentstate.asp">MsiGetComponentState</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetcomponentstate.asp">MsiSetComponentState</a>
+        /// </p></remarks>
+        public InstallState RequestState
+        {
+            get
+            {
+                int installedState, actionState;
+                uint ret = RemotableNativeMethods.MsiGetComponentState((int) this.session.Handle, this.name, out installedState, out actionState);
+                if (ret != 0)
+                {
+                    if (ret == (uint) NativeMethods.Error.UNKNOWN_COMPONENT)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret, this.name);
+                    }
+                    else
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                }
+                return (InstallState) actionState;
+            }
+
+            set
+            {
+                uint ret = RemotableNativeMethods.MsiSetComponentState((int) this.session.Handle, this.name, (int) value);
+                if (ret != 0)
+                {
+                    if (ret == (uint) NativeMethods.Error.UNKNOWN_COMPONENT)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret, this.name);
+                    }
+                    else
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets disk space per drive required to install a component.
+        /// </summary>
+        /// <param name="installState">Requested component state</param>
+        /// <returns>A list of InstallCost structures, specifying the cost for each drive for the component</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumcomponentcosts.asp">MsiEnumComponentCosts</a>
+        /// </p></remarks>
+        public IList<InstallCost> GetCost(InstallState installState)
+        {
+            IList<InstallCost> costs = new List<InstallCost>();
+            StringBuilder driveBuf = new StringBuilder(20);
+            for (uint i = 0; true; i++)
+            {
+                int cost, tempCost;
+                uint driveBufSize = (uint) driveBuf.Capacity;
+                uint ret = RemotableNativeMethods.MsiEnumComponentCosts(
+                    (int) this.session.Handle,
+                    this.name,
+                    i,
+                    (int) installState,
+                    driveBuf,
+                    ref driveBufSize,
+                    out cost,
+                    out tempCost);
+                if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS) break;
+                if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                {
+                    driveBuf.Capacity = (int) ++driveBufSize;
+                    ret = RemotableNativeMethods.MsiEnumComponentCosts(
+                        (int) this.session.Handle,
+                        this.name,
+                        i,
+                        (int) installState,
+                        driveBuf,
+                        ref driveBufSize,
+                        out cost,
+                        out tempCost);
+                }
+
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                costs.Add(new InstallCost(driveBuf.ToString(), cost * 512L, tempCost * 512L));
+            }
+            return costs;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/ComponentInstallation.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/ComponentInstallation.cs
new file mode 100644
index 00000000..6d368899
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/ComponentInstallation.cs
@@ -0,0 +1,382 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Represents an instance of a registered component.
+    /// </summary>
+    public class ComponentInstallation : InstallationPart
+    {
+        /// <summary>
+        /// Gets the set of installed components for all products.
+        /// </summary>
+        /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumcomponents.asp">MsiEnumComponents</a>
+        /// </p></remarks>
+        public static IEnumerable<ComponentInstallation> AllComponents
+        {
+            get
+            {
+                StringBuilder buf = new StringBuilder(40);
+                for (uint i = 0; true; i++)
+                {
+                    uint ret = NativeMethods.MsiEnumComponents(i, buf);
+                    if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS) break;
+                    if (ret != 0)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                    yield return new ComponentInstallation(buf.ToString());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the set of installed components for products in the indicated context.
+        /// </summary>
+        /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/dd407947.aspx">MsiEnumComponentsEx</a>
+        /// </p></remarks>
+        public static IEnumerable<ComponentInstallation> Components(string szUserSid, UserContexts dwContext)
+        {
+            uint pcchSid = 32;
+            StringBuilder szSid = new StringBuilder((int)pcchSid);
+            StringBuilder buf = new StringBuilder(40);
+            UserContexts installedContext;
+            for (uint i = 0; true; i++)
+            {
+                uint  ret = NativeMethods.MsiEnumComponentsEx(szUserSid, dwContext, i, buf, out installedContext, szSid, ref pcchSid);
+                if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                {
+                    szSid.EnsureCapacity((int) ++pcchSid);
+                    ret = NativeMethods.MsiEnumComponentsEx(szUserSid, dwContext, i, buf, out installedContext, szSid, ref pcchSid);
+                }
+                if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS) break;
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                yield return new ComponentInstallation(buf.ToString(), szSid.ToString(), installedContext);
+            }
+        }
+        private static string GetProductCode(string component)
+        {
+            StringBuilder buf = new StringBuilder(40);
+            uint ret = NativeMethods.MsiGetProductCode(component, buf);
+            if (ret != 0)
+            {
+                return null;
+            }
+
+            return buf.ToString();
+        }
+
+        private static string GetProductCode(string component, string szUserSid, UserContexts dwContext)
+        {
+            // TODO: We really need what would be MsiGetProductCodeEx, or at least a reasonable facimile thereof (something that restricts the search to the context defined by szUserSid & dwContext)
+            return GetProductCode(component);
+        }
+
+        /// <summary>
+        /// Creates a new ComponentInstallation, automatically detecting the
+        /// product that the component is a part of.
+        /// </summary>
+        /// <param name="componentCode">component GUID</param>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetproductcode.asp">MsiGetProductCode</a>
+        /// </p></remarks>
+        public ComponentInstallation(string componentCode)
+            : this(componentCode, ComponentInstallation.GetProductCode(componentCode))
+        {
+        }
+
+        /// <summary>
+        /// Creates a new ComponentInstallation, automatically detecting the
+        /// product that the component is a part of.
+        /// </summary>
+        /// <param name="componentCode">component GUID</param>
+        /// <param name="szUserSid">context user SID</param>
+        /// <param name="dwContext">user contexts</param>
+        public ComponentInstallation(string componentCode, string szUserSid, UserContexts dwContext)
+            : this(componentCode, ComponentInstallation.GetProductCode(componentCode, szUserSid, dwContext), szUserSid, dwContext)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new ComponentInstallation for a component installed by a
+        /// specific product.
+        /// </summary>
+        /// <param name="componentCode">component GUID</param>
+        /// <param name="productCode">ProductCode GUID</param>
+        public ComponentInstallation(string componentCode, string productCode)
+            : this(componentCode, productCode, null, UserContexts.None)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new ComponentInstallation for a component installed by a
+        /// specific product.
+        /// </summary>
+        /// <param name="componentCode">component GUID</param>
+        /// <param name="productCode">ProductCode GUID</param>
+        /// <param name="szUserSid">context user SID</param>
+        /// <param name="dwContext">user contexts</param>
+        public ComponentInstallation(string componentCode, string productCode, string szUserSid, UserContexts dwContext)
+            : base(componentCode, productCode, szUserSid, dwContext)
+        {
+            if (string.IsNullOrEmpty(componentCode))
+            {
+                throw new ArgumentNullException("componentCode");
+            }
+        }
+
+        /// <summary>
+        /// Gets the component code (GUID) of the component.
+        /// </summary>
+        public string ComponentCode
+        {
+            get
+            {
+                return this.Id;
+            }
+        }
+
+        /// <summary>
+        /// Gets all client products of a specified component.
+        /// </summary>
+        /// <returns>enumeration over all client products of the component</returns>
+        /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+        /// <remarks><p>
+        /// Because clients are not ordered, any new component has an arbitrary index.
+        /// This means that the property may return clients in any order.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumclients.asp">MsiEnumClients</a>,
+        /// <a href="http://msdn.microsoft.com/library/dd407946.aspx">MsiEnumClientsEx</a>
+        /// </p></remarks>
+        public IEnumerable<ProductInstallation> ClientProducts
+        {
+            get
+            {
+                StringBuilder buf = new StringBuilder(40);
+                for (uint i = 0; true; i++)
+                {
+                    uint chSid = 0;
+                    UserContexts installedContext;
+                    uint ret = this.Context == UserContexts.None ?
+                            NativeMethods.MsiEnumClients(this.ComponentCode, i, buf) :
+                            NativeMethods.MsiEnumClientsEx(this.ComponentCode, this.UserSid, this.Context, i, buf, out installedContext, null, ref chSid);
+                    if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS) break;
+                    else if (ret == (uint) NativeMethods.Error.UNKNOWN_COMPONENT) break;
+                    if (ret != 0)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                    yield return new ProductInstallation(buf.ToString());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the installed state of a component.
+        /// </summary>
+        /// <returns>the installed state of the component, or InstallState.Unknown
+        /// if this component is not part of a product</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetcomponentpath.asp">MsiGetComponentPath</a>,
+        /// <a href="http://msdn.microsoft.com/library/dd408006.aspx">MsiGetComponentPathEx</a>
+        /// </p></remarks>
+        public override InstallState State
+        {
+            get
+            {
+                if (this.ProductCode != null)
+                {
+                    uint bufSize = 0;
+                    int installState = this.Context == UserContexts.None ?
+                        NativeMethods.MsiGetComponentPath(
+                            this.ProductCode, this.ComponentCode, null, ref bufSize) :
+                        NativeMethods.MsiGetComponentPathEx(
+                            this.ProductCode, this.ComponentCode, this.UserSid, this.Context, null, ref bufSize);
+                    return (InstallState) installState;
+                }
+                else
+                {
+                    return InstallState.Unknown;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path to an installed component. If the key path for the component is a
+        /// registry key then the registry key is returned.
+        /// </summary>
+        /// <returns>The file or registry keypath to the component, or null if the component is not available.</returns>
+        /// <exception cref="ArgumentException">An unknown product or component was specified</exception>
+        /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+        /// <remarks><p>
+        /// If the component is a registry key, the registry roots are represented numerically.
+        /// For example, a registry path of "HKEY_CURRENT_USER\SOFTWARE\Microsoft" would be returned
+        /// as "01:\SOFTWARE\Microsoft". The registry roots returned are defined as follows:
+        /// HKEY_CLASSES_ROOT=00, HKEY_CURRENT_USER=01, HKEY_LOCAL_MACHINE=02, HKEY_USERS=03,
+        /// HKEY_PERFORMANCE_DATA=04
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetcomponentpath.asp">MsiGetComponentPath</a>,
+        /// <a href="http://msdn.microsoft.com/library/dd408006.aspx">MsiGetComponentPathEx</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msilocatecomponent.asp">MsiLocateComponent</a>
+        /// </p></remarks>
+        public string Path
+        {
+            get
+            {
+                StringBuilder buf = new StringBuilder(256);
+                uint bufSize = (uint) buf.Capacity;
+                InstallState installState;
+
+                if (this.ProductCode != null)
+                {
+                    installState = (this.Context == UserContexts.None) ?
+                        (InstallState) NativeMethods.MsiGetComponentPath(
+                            this.ProductCode, this.ComponentCode, buf, ref bufSize) :
+                        (InstallState) NativeMethods.MsiGetComponentPathEx(
+                            this.ProductCode, this.ComponentCode, this.UserSid, this.Context, buf, ref bufSize);
+                    if (installState == InstallState.MoreData)
+                    {
+                        buf.Capacity = (int) ++bufSize;
+                        installState = (this.Context == UserContexts.None) ?
+                            (InstallState) NativeMethods.MsiGetComponentPath(
+                                this.ProductCode, this.ComponentCode, buf, ref bufSize) :
+                            (InstallState) NativeMethods.MsiGetComponentPathEx(
+                                this.ProductCode, this.ComponentCode, this.UserSid, this.Context, buf, ref bufSize);
+                    }
+                }
+                else
+                {
+                    installState = (InstallState) NativeMethods.MsiLocateComponent(
+                        this.ComponentCode, buf, ref bufSize);
+                    if (installState == InstallState.MoreData)
+                    {
+                        buf.Capacity = (int) ++bufSize;
+                        installState = (InstallState) NativeMethods.MsiLocateComponent(
+                            this.ComponentCode, buf, ref bufSize);
+                    }
+                }
+
+                switch (installState)
+                {
+                    case InstallState.Local:
+                    case InstallState.Source:
+                    case InstallState.SourceAbsent:
+                        return buf.ToString();
+
+                    default:
+                        return null;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the set of registered qualifiers for the component.
+        /// </summary>
+        /// <returns>Enumeration of the qulifiers for the component.</returns>
+        /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+        /// <remarks><p>
+        /// Because qualifiers are not ordered, any new qualifier has an arbitrary index,
+        /// meaning the function can return qualifiers in any order.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumcomponentqualifiers.asp">MsiEnumComponentQualifiers</a>
+        /// </p></remarks>
+        public IEnumerable<ComponentInstallation.Qualifier> Qualifiers
+        {
+            get
+            {
+                StringBuilder qualBuf = new StringBuilder(255);
+                StringBuilder dataBuf = new StringBuilder(255);
+                for (uint i = 0; ; i++)
+                {
+                    uint qualBufSize = (uint) qualBuf.Capacity;
+                    uint dataBufSize = (uint) dataBuf.Capacity;
+                    uint ret = NativeMethods.MsiEnumComponentQualifiers(
+                        this.ComponentCode, i, qualBuf, ref qualBufSize, dataBuf, ref dataBufSize);
+                    if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                    {
+                        qualBuf.Capacity = (int) ++qualBufSize;
+                        dataBuf.Capacity = (int) ++dataBufSize;
+                        ret = NativeMethods.MsiEnumComponentQualifiers(
+                            this.ComponentCode, i, qualBuf, ref qualBufSize, dataBuf, ref dataBufSize);
+                    }
+
+                    if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS ||
+                        ret == (uint) NativeMethods.Error.UNKNOWN_COMPONENT)
+                    {
+                        break;
+                    }
+
+                    if (ret != 0)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+
+                    yield return new ComponentInstallation.Qualifier(
+                        qualBuf.ToString(), dataBuf.ToString());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Holds data about a component qualifier.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumcomponentqualifiers.asp">MsiEnumComponentQualifiers</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible")]
+        [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes")]
+        public struct Qualifier
+        {
+            private string qualifierCode;
+            private string data;
+
+            internal Qualifier(string qualifierCode, string data)
+            {
+                this.qualifierCode = qualifierCode;
+                this.data = data;
+            }
+
+            /// <summary>
+            /// Gets the qualifier code.
+            /// </summary>
+            public string QualifierCode
+            {
+                get
+                {
+                    return this.qualifierCode;
+                }
+            }
+
+            /// <summary>
+            /// Gets the qualifier data.
+            /// </summary>
+            public string Data
+            {
+                get
+                {
+                    return this.data;
+                }
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionAttribute.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionAttribute.cs
new file mode 100644
index 00000000..d9bdb71b
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionAttribute.cs
@@ -0,0 +1,55 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Reflection;
+
+    /// <summary>
+    /// Marks a method as a custom action entry point.
+    /// </summary>
+    /// <remarks><p>
+    /// A custom action method must be defined as public and static,
+    /// take a single <see cref="Session"/> object as a parameter,
+    /// and return an <see cref="ActionResult"/> enumeration value.
+    /// </p></remarks>
+    [Serializable, AttributeUsage(AttributeTargets.Method)]
+    public sealed class CustomActionAttribute : Attribute
+    {
+        /// <summary>
+        /// Name of the custom action entrypoint, or null if the same as the method name.
+        /// </summary>
+        private string name;
+
+        /// <summary>
+        /// Marks a method as a custom action entry point.
+        /// </summary>
+        public CustomActionAttribute()
+            : this(null)
+        {
+        }
+
+        /// <summary>
+        /// Marks a method as a custom action entry point.
+        /// </summary>
+        /// <param name="name">Name of the function to be exported,
+        /// defaults to the name of this method</param>
+        public CustomActionAttribute(string name)
+        {
+            this.name = name;
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the custom action entrypoint. A null
+        /// value defaults to the name of the method.
+        /// </summary>
+        /// <value>name of the custom action entrypoint, or null if none was specified</value>
+        public string Name
+        {
+            get
+            {
+                return this.name;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs
new file mode 100644
index 00000000..d3fd7d1b
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/CustomActionProxy.cs
@@ -0,0 +1,321 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Security;
+    using System.Reflection;
+    using System.Collections;
+    using System.Configuration;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Managed-code portion of the custom action proxy.
+    /// </summary>
+    internal static class CustomActionProxy
+    {
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int InvokeCustomAction32(int sessionHandle, string entryPoint,
+            int remotingDelegatePtr)
+        {
+            return CustomActionProxy.InvokeCustomAction(sessionHandle, entryPoint, new IntPtr(remotingDelegatePtr));
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int InvokeCustomAction64(int sessionHandle, string entryPoint,
+            long remotingDelegatePtr)
+        {
+            return CustomActionProxy.InvokeCustomAction(sessionHandle, entryPoint, new IntPtr(remotingDelegatePtr));
+        }
+
+        /// <summary>
+        /// Invokes a managed custom action method.
+        /// </summary>
+        /// <param name="sessionHandle">Integer handle to the installer session.</param>
+        /// <param name="entryPoint">Name of the custom action entrypoint. This must
+        /// either map to an entrypoint definition in the <c>customActions</c>
+        /// config section, or be an explicit entrypoint of the form:
+        /// &quot;AssemblyName!Namespace.Class.Method&quot;</param>
+        /// <param name="remotingDelegatePtr">Pointer to a delegate used to
+        /// make remote API calls, if this custom action is running out-of-proc.</param>
+        /// <returns>The value returned by the custom action method,
+        /// or ERROR_INSTALL_FAILURE if the custom action could not be invoked.</returns>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int InvokeCustomAction(int sessionHandle, string entryPoint,
+            IntPtr remotingDelegatePtr)
+        {
+            Session session = null;
+            string assemblyName, className, methodName;
+            MethodInfo method;
+
+            try
+            {
+                MsiRemoteInvoke remotingDelegate = (MsiRemoteInvoke)
+                    Marshal.GetDelegateForFunctionPointer(
+                        remotingDelegatePtr, typeof(MsiRemoteInvoke));
+                RemotableNativeMethods.RemotingDelegate = remotingDelegate;
+
+                sessionHandle = RemotableNativeMethods.MakeRemoteHandle(sessionHandle);
+                session = new Session((IntPtr) sessionHandle, false);
+                if (String.IsNullOrEmpty(entryPoint))
+                {
+                    throw new ArgumentNullException("entryPoint");
+                }
+
+                if (!CustomActionProxy.FindEntryPoint(
+                    session,
+                    entryPoint,
+                    out assemblyName,
+                    out className,
+                    out methodName))
+                {
+                    return (int) ActionResult.Failure;
+                }
+                session.Log("Calling custom action {0}!{1}.{2}", assemblyName, className, methodName);
+
+                method = CustomActionProxy.GetCustomActionMethod(
+                    session,
+                    assemblyName,
+                    className,
+                    methodName);
+                if (method == null)
+                {
+                    return (int) ActionResult.Failure;
+                }
+            }
+            catch (Exception ex)
+            {
+                if (session != null)
+                {
+                    try
+                    {
+                        session.Log("Exception while loading custom action:");
+                        session.Log(ex.ToString());
+                    }
+                    catch (Exception) { }
+                }
+                return (int) ActionResult.Failure;
+            }
+
+            try
+            {
+                // Set the current directory to the location of the extracted files.
+                Environment.CurrentDirectory =
+                    AppDomain.CurrentDomain.BaseDirectory;
+
+                object[] args = new object[] { session };
+                if (DebugBreakEnabled(new string[] { entryPoint, methodName }))
+                {
+                    string message = String.Format(
+                        "To debug your custom action, attach to process ID {0} (0x{0:x}) and click OK; otherwise, click Cancel to fail the custom action.",
+                        System.Diagnostics.Process.GetCurrentProcess().Id
+                        );
+
+                    MessageResult button = NativeMethods.MessageBox(
+                        IntPtr.Zero,
+                        message,
+                        "Custom Action Breakpoint",
+                        (int)MessageButtons.OKCancel | (int)MessageIcon.Asterisk | (int)(MessageBoxStyles.TopMost | MessageBoxStyles.ServiceNotification)
+                        );
+
+                    if (MessageResult.Cancel == button)
+                    {
+                        return (int)ActionResult.UserExit;
+                    }
+                }
+
+                ActionResult result = (ActionResult) method.Invoke(null, args);
+                session.Close();
+                return (int) result;
+            }
+            catch (InstallCanceledException)
+            {
+                return (int) ActionResult.UserExit;
+            }
+            catch (Exception ex)
+            {
+                session.Log("Exception thrown by custom action:");
+                session.Log(ex.ToString());
+                return (int) ActionResult.Failure;
+            }
+        }
+
+        /// <summary>
+        /// Checks the "MMsiBreak" environment variable for any matching custom action names.
+        /// </summary>
+        /// <param name="names">List of names to search for in the environment
+        /// variable string.</param>
+        /// <returns>True if a match was found, else false.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal static bool DebugBreakEnabled(string[] names)
+        {
+            string mmsibreak = Environment.GetEnvironmentVariable("MMsiBreak");
+            if (mmsibreak != null)
+            {
+                foreach (string breakName in mmsibreak.Split(',', ';'))
+                {
+                    foreach (string name in names)
+                    {
+                        if (breakName == name)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Locates and parses an entrypoint mapping in CustomAction.config.
+        /// </summary>
+        /// <param name="session">Installer session handle, just used for logging.</param>
+        /// <param name="entryPoint">Custom action entrypoint name: the key value
+        /// in an item in the <c>customActions</c> section of the config file.</param>
+        /// <param name="assemblyName">Returned display name of the assembly from
+        /// the entrypoint mapping.</param>
+        /// <param name="className">Returned class name of the entrypoint mapping.</param>
+        /// <param name="methodName">Returned method name of the entrypoint mapping.</param>
+        /// <returns>True if the entrypoint was found, false if not or if some error
+        /// occurred.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        private static bool FindEntryPoint(
+            Session session,
+            string entryPoint,
+            out string assemblyName,
+            out string className,
+            out string methodName)
+        {
+            assemblyName = null;
+            className = null;
+            methodName = null;
+
+            string fullEntryPoint;
+            if (entryPoint.IndexOf('!') > 0)
+            {
+                fullEntryPoint = entryPoint;
+            }
+            else
+            {
+#if NET20
+                IDictionary config;
+                try
+                {
+                    config = (IDictionary) ConfigurationManager.GetSection("customActions");
+                }
+                catch (ConfigurationException cex)
+                {
+                    session.Log("Error: missing or invalid customActions config section.");
+                    session.Log(cex.ToString());
+                    return false;
+                }
+                fullEntryPoint = (string) config[entryPoint];
+                if (fullEntryPoint == null)
+                {
+                    session.Log(
+                        "Error: custom action entry point '{0}' not found " +
+                        "in customActions config section.",
+                        entryPoint);
+                    return false;
+                }
+#else
+                throw new NotImplementedException();
+#endif
+            }
+
+            int assemblySplit = fullEntryPoint.IndexOf('!');
+            int methodSplit = fullEntryPoint.LastIndexOf('.');
+            if (assemblySplit < 0 || methodSplit < 0 || methodSplit < assemblySplit)
+            {
+                session.Log("Error: invalid custom action entry point:" + entryPoint);
+                return false;
+            }
+
+            assemblyName = fullEntryPoint.Substring(0, assemblySplit);
+            className = fullEntryPoint.Substring(assemblySplit + 1, methodSplit - assemblySplit - 1);
+            methodName = fullEntryPoint.Substring(methodSplit + 1);
+            return true;
+        }
+
+        /// <summary>
+        /// Uses reflection to load the assembly and class and find the method.
+        /// </summary>
+        /// <param name="session">Installer session handle, just used for logging.</param>
+        /// <param name="assemblyName">Display name of the assembly containing the
+        /// custom action method.</param>
+        /// <param name="className">Fully-qualified name of the class containing the
+        /// custom action method.</param>
+        /// <param name="methodName">Name of the custom action method.</param>
+        /// <returns>The method, or null if not found.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        private static MethodInfo GetCustomActionMethod(
+            Session session,
+            string assemblyName,
+            string className,
+            string methodName)
+        {
+            Assembly customActionAssembly;
+            Type customActionClass = null;
+            Exception caughtEx = null;
+            try
+            {
+                customActionAssembly = AppDomain.CurrentDomain.Load(assemblyName);
+                customActionClass = customActionAssembly.GetType(className, true, true);
+            }
+            catch (IOException ex) { caughtEx = ex; }
+            catch (BadImageFormatException ex) { caughtEx = ex; }
+            catch (TypeLoadException ex) { caughtEx = ex; }
+            catch (ReflectionTypeLoadException ex) { caughtEx = ex; }
+            catch (SecurityException ex) { caughtEx = ex; }
+            if (caughtEx != null)
+            {
+                session.Log("Error: could not load custom action class " + className + " from assembly: " + assemblyName);
+                session.Log(caughtEx.ToString());
+                return null;
+            }
+
+            MethodInfo[] methods = customActionClass.GetMethods(
+                BindingFlags.Public | BindingFlags.Static);
+            foreach (MethodInfo method in methods)
+            {
+                if (method.Name == methodName &&
+                    CustomActionProxy.MethodHasCustomActionSignature(method))
+                {
+                    return method;
+                }
+            }
+            session.Log("Error: custom action method \"" + methodName +
+                "\" is missing or has the wrong signature.");
+            return null;
+        }
+
+        /// <summary>
+        /// Checks if a method has the right return and paramater types
+        /// for a custom action, and that it is marked by a CustomActionAttribute.
+        /// </summary>
+        /// <param name="method">Method to be checked.</param>
+        /// <returns>True if the method is a valid custom action, else false.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        private static bool MethodHasCustomActionSignature(MethodInfo method)
+        {
+            if (method.ReturnType == typeof(ActionResult) &&
+                method.GetParameters().Length == 1 &&
+                method.GetParameters()[0].ParameterType == typeof(Session))
+            {
+                object[] methodAttribs = method.GetCustomAttributes(false);
+                foreach (object attrib in methodAttribs)
+                {
+                    if (attrib is CustomActionAttribute)
+                    {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Database.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/Database.cs
new file mode 100644
index 00000000..09627f4b
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Database.cs
@@ -0,0 +1,933 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Accesses a Windows Installer database.
+    /// </summary>
+    /// <remarks><p>
+    /// The <see cref="Commit"/> method must be called before the Database is closed to write out all
+    /// persistent changes. If the Commit method is not called, the installer performs an implicit
+    /// rollback upon object destruction.
+    /// </p><p>
+    /// The client can use the following procedure for data access:<list type="number">
+    /// <item><description>Obtain a Database object using one of the Database constructors.</description></item> 
+    /// <item><description>Initiate a query using a SQL string by calling the <see cref="OpenView"/>
+    ///         method of the Database.</description></item> 
+    /// <item><description>Set query parameters in a <see cref="Record"/> and execute the database
+    ///         query by calling the <see cref="View.Execute(Record)"/> method of the <see cref="View"/>. This
+    ///         produces a result that can be fetched or updated.</description></item> 
+    /// <item><description>Call the <see cref="View.Fetch"/> method of the View repeatedly to return
+    ///         Records.</description></item> 
+    /// <item><description>Update database rows of a Record object obtained by the Fetch method using
+    ///         one of the <see cref="View.Modify"/> methods of the View.</description></item> 
+    /// <item><description>Release the query and any unfetched records by calling the <see cref="InstallerHandle.Close"/>
+    ///         method of the View.</description></item> 
+    /// <item><description>Persist any database updates by calling the Commit method of the Database.
+    ///         </description></item> 
+    /// </list>
+    /// </p></remarks>
+    public partial class Database : InstallerHandle
+    {
+        private string filePath;
+        private DatabaseOpenMode openMode;
+        private SummaryInfo summaryInfo;
+        private TableCollection tables;
+        private IList<string> deleteOnClose;
+
+        /// <summary>
+        /// Opens an existing database in read-only mode.
+        /// </summary>
+        /// <param name="filePath">Path to the database file.</param>
+        /// <exception cref="InstallerException">the database could not be created/opened</exception>
+        /// <remarks><p>
+        /// Because this constructor initiates database access, it cannot be used with a
+        /// running installation.
+        /// </p><p>
+        /// The Database object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// It is best that the handle be closed manually as soon as it is no longer
+        /// needed, as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiopendatabase.asp">MsiOpenDatabase</a>
+        /// </p></remarks>
+        public Database(string filePath)
+            : this(filePath, DatabaseOpenMode.ReadOnly)
+        {
+        }
+
+        /// <summary>
+        /// Opens an existing database with another database as output.
+        /// </summary>
+        /// <param name="filePath">Path to the database to be read.</param>
+        /// <param name="outputPath">Open mode for the database</param>
+        /// <returns>Database object representing the created or opened database</returns>
+        /// <exception cref="InstallerException">the database could not be created/opened</exception>
+        /// <remarks><p>
+        /// When a database is opened as the output of another database, the summary information stream
+        /// of the output database is actually a read-only mirror of the original database and thus cannot
+        /// be changed. Additionally, it is not persisted with the database. To create or modify the
+        /// summary information for the output database it must be closed and re-opened.
+        /// </p><p>
+        /// The Database object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// It is best that the handle be closed manually as soon as it is no longer
+        /// needed, as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// The database is opened in <see cref="DatabaseOpenMode.CreateDirect" /> mode, and will be
+        /// automatically commited when it is closed.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiopendatabase.asp">MsiOpenDatabase</a>
+        /// </p></remarks>
+        public Database(string filePath, string outputPath)
+            : this((IntPtr) Database.Open(filePath, outputPath), true, outputPath, DatabaseOpenMode.CreateDirect)
+        {
+        }
+
+        /// <summary>
+        /// Opens an existing database or creates a new one.
+        /// </summary>
+        /// <param name="filePath">Path to the database file. If an empty string
+        /// is supplied, a temporary database is created that is not persisted.</param>
+        /// <param name="mode">Open mode for the database</param>
+        /// <exception cref="InstallerException">the database could not be created/opened</exception>
+        /// <remarks><p>
+        /// Because this constructor initiates database access, it cannot be used with a
+        /// running installation.
+        /// </p><p>
+        /// The database object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// The finalizer will close the handle if it is still open, however due to the nondeterministic
+        /// nature of finalization it is best that the handle be closed manually as soon as it is no
+        /// longer needed, as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// A database opened in <see cref="DatabaseOpenMode.CreateDirect" /> or
+        /// <see cref="DatabaseOpenMode.Direct" /> mode will be automatically commited when it is
+        /// closed. However a database opened in <see cref="DatabaseOpenMode.Create" /> or
+        /// <see cref="DatabaseOpenMode.Transact" /> mode must have the <see cref="Commit" /> method
+        /// called before it is closed, otherwise no changes will be persisted.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiopendatabase.asp">MsiOpenDatabase</a>
+        /// </p></remarks>
+        public Database(string filePath, DatabaseOpenMode mode)
+            : this((IntPtr) Database.Open(filePath, mode), true, filePath, mode)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new database from an MSI handle.
+        /// </summary>
+        /// <param name="handle">Native MSI database handle.</param>
+        /// <param name="ownsHandle">True if the handle should be closed
+        /// when the database object is disposed</param>
+        /// <param name="filePath">Path of the database file, if known</param>
+        /// <param name="openMode">Mode the handle was originally opened in</param>
+        protected internal Database(
+            IntPtr handle, bool ownsHandle, string filePath, DatabaseOpenMode openMode)
+            : base(handle, ownsHandle)
+        {
+            this.filePath = filePath;
+            this.openMode = openMode;
+        }
+
+        /// <summary>
+        /// Gets the file path the Database was originally opened from, or null if not known.
+        /// </summary>
+        public String FilePath
+        {
+            get
+            {
+                return this.filePath;
+            }
+        }
+
+        /// <summary>
+        /// Gets the open mode for the database.
+        /// </summary>
+        public DatabaseOpenMode OpenMode
+        {
+            get
+            {
+                return this.openMode;
+            }
+        }
+
+        /// <summary>
+        /// Gets a boolean value indicating whether this database was opened in read-only mode.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetdatabasestate.asp">MsiGetDatabaseState</a>
+        /// </p></remarks>
+        public bool IsReadOnly
+        {
+            get
+            {
+                if (RemotableNativeMethods.RemotingEnabled)
+                {
+                    return true;
+                }
+
+                int state = NativeMethods.MsiGetDatabaseState((int) this.Handle);
+                return state != 1;
+            }
+        }
+
+        /// <summary>
+        /// Gets the collection of tables in the Database.
+        /// </summary>
+        public TableCollection Tables
+        {
+            get
+            {
+                if (this.tables == null)
+                {
+                    this.tables = new TableCollection(this);
+                }
+                return this.tables;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the code page of the Database.
+        /// </summary>
+        /// <exception cref="IOException">error exporting/importing the codepage data</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Getting or setting the code page is a slow operation because it involves an export or import
+        /// of the codepage data to/from a temporary file.
+        /// </p></remarks>
+        public int CodePage
+        {
+            get
+            {
+                string tempFile = Path.GetTempFileName();
+                StreamReader reader = null;
+                try
+                {
+                    this.Export("_ForceCodepage", tempFile);
+                    reader = File.OpenText(tempFile);
+                    reader.ReadLine();  // Skip column name record.
+                    reader.ReadLine();  // Skip column defn record.
+                    string codePageLine = reader.ReadLine();
+                    return Int32.Parse(codePageLine.Split('\t')[0], CultureInfo.InvariantCulture.NumberFormat);
+                }
+                finally
+                {
+                    if (reader != null) reader.Close();
+                    File.Delete(tempFile);
+                }
+            }
+
+            set
+            {
+                string tempFile = Path.GetTempFileName();
+                StreamWriter writer = null;
+                try
+                {
+                    writer = File.AppendText(tempFile);
+                    writer.WriteLine("");
+                    writer.WriteLine("");
+                    writer.WriteLine("{0}\t_ForceCodepage", value);
+                    writer.Close();
+                    writer = null;
+                    this.Import(tempFile);
+                }
+                finally
+                {
+                    if (writer != null) writer.Close();
+                    File.Delete(tempFile);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the SummaryInfo object for this database that can be used to examine and modify properties
+        /// to the summary information stream.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// The object returned from this property does not need to be explicitly persisted or closed.
+        /// Any modifications will be automatically saved when the database is committed.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetsummaryinformation.asp">MsiGetSummaryInformation</a>
+        /// </p></remarks>
+        public SummaryInfo SummaryInfo
+        {
+            get
+            {
+                if (this.summaryInfo == null || this.summaryInfo.IsClosed)
+                {
+                    lock (this.Sync)
+                    {
+                        if (this.summaryInfo == null || this.summaryInfo.IsClosed)
+                        {
+                            int summaryInfoHandle;
+                            int maxProperties = this.IsReadOnly ? 0 : SummaryInfo.MAX_PROPERTIES;
+                            uint ret = RemotableNativeMethods.MsiGetSummaryInformation((int) this.Handle, null, (uint) maxProperties, out summaryInfoHandle);
+                            if (ret != 0)
+                            {
+                                throw InstallerException.ExceptionFromReturnCode(ret);
+                            }
+                            this.summaryInfo = new SummaryInfo((IntPtr) summaryInfoHandle, true);
+                        }
+                    }
+                }
+                return this.summaryInfo;
+            }
+        }
+
+        /// <summary>
+        /// Creates a new Database object from an integer database handle.
+        /// </summary>
+        /// <remarks><p>
+        /// This method is only provided for interop purposes.  A Database object
+        /// should normally be obtained from <see cref="Session.Database"/> or
+        /// a public Database constructor.
+        /// </p></remarks>
+        /// <param name="handle">Integer database handle</param>
+        /// <param name="ownsHandle">true to close the handle when this object is disposed</param>
+        public static Database FromHandle(IntPtr handle, bool ownsHandle)
+        {
+            return new Database(
+                handle,
+                ownsHandle,
+                null,
+                NativeMethods.MsiGetDatabaseState((int) handle) == 1 ? DatabaseOpenMode.Direct : DatabaseOpenMode.ReadOnly);
+        }
+
+        /// <summary>
+        /// Schedules a file or directory for deletion after the database handle is closed.
+        /// </summary>
+        /// <param name="path">File or directory path to be deleted. All files and subdirectories
+        /// under a directory are deleted.</param>
+        /// <remarks><p>
+        /// Once an item is scheduled, it cannot be unscheduled.
+        /// </p><p>
+        /// The items cannot be deleted if the Database object is auto-disposed by the
+        /// garbage collector; the handle must be explicitly closed.
+        /// </p><p>
+        /// Files which are read-only or otherwise locked cannot be deleted,
+        /// but they will not cause an exception to be thrown.
+        /// </p></remarks>
+        public void DeleteOnClose(string path)
+        {
+            if (this.deleteOnClose == null)
+            {
+                this.deleteOnClose = new List<string>();
+            }
+            this.deleteOnClose.Add(path);
+        }
+
+        /// <summary>
+        /// Merges another database with this database.
+        /// </summary>
+        /// <param name="otherDatabase">The database to be merged into this database</param>
+        /// <param name="errorTable">Optional name of table to contain the names of the tables containing
+        /// merge conflicts, the number of conflicting rows within the table, and a reference to the table
+        /// with the merge conflict.</param>
+        /// <exception cref="MergeException">merge failed due to a schema difference or data conflict</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Merge does not copy over embedded cabinet files or embedded transforms from the
+        /// reference database into the target database. Embedded data streams that are listed in the
+        /// Binary table or Icon table are copied from the reference database to the target database.
+        /// Storage embedded in the reference database are not copied to the target database.
+        /// </p><p>
+        /// The Merge method merges the data of two databases. These databases must have the same
+        /// codepage. The merge fails if any tables or rows in the databases conflict. A conflict exists
+        /// if the data in any row in the first database differs from the data in the corresponding row
+        /// of the second database. Corresponding rows are in the same table of both databases and have
+        /// the same primary key in both databases. The tables of non-conflicting databases must have
+        /// the same number of primary keys, same number of columns, same column types, same column names,
+        /// and the same data in rows with identical primary keys. Temporary columns however don't matter
+        /// in the column count and corresponding tables can have a different number of temporary columns
+        /// without creating conflict as long as the persistent columns match.
+        /// </p><p>
+        /// If the number, type, or name of columns in corresponding tables are different, the
+        /// schema of the two databases are incompatible and the installer will stop processing tables
+        /// and the merge fails. The installer checks that the two databases have the same schema before
+        /// checking for row merge conflicts. If the schemas are incompatible, the databases have be
+        /// modified.
+        /// </p><p>
+        /// If the data in particular rows differ, this is a row merge conflict, the merge fails
+        /// and creates a new table with the specified name. The first column of this table is the name
+        /// of the table having the conflict. The second column gives the number of rows in the table
+        /// having the conflict.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabasemerge.asp">MsiDatabaseMerge</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public void Merge(Database otherDatabase, string errorTable)
+        {
+            if (otherDatabase == null)
+            {
+                throw new ArgumentNullException("otherDatabase");
+            }
+
+            uint ret = NativeMethods.MsiDatabaseMerge((int) this.Handle, (int) otherDatabase.Handle, errorTable);
+            if (ret != 0)
+            {
+                if (ret == (uint) NativeMethods.Error.FUNCTION_FAILED)
+                {
+                    throw new MergeException(this, errorTable);
+                }
+                else if (ret == (uint) NativeMethods.Error.DATATYPE_MISMATCH)
+                {
+                    throw new MergeException("Schema difference between the two databases.");
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Merges another database with this database.
+        /// </summary>
+        /// <param name="otherDatabase">The database to be merged into this database</param>
+        /// <exception cref="MergeException">merge failed due to a schema difference or data conflict</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// MsiDatabaseMerge does not copy over embedded cabinet files or embedded transforms from
+        /// the reference database into the target database. Embedded data streams that are listed in
+        /// the Binary table or Icon table are copied from the reference database to the target database.
+        /// Storage embedded in the reference database are not copied to the target database.
+        /// </p><p>
+        /// The Merge method merges the data of two databases. These databases must have the same
+        /// codepage. The merge fails if any tables or rows in the databases conflict. A conflict exists
+        /// if the data in any row in the first database differs from the data in the corresponding row
+        /// of the second database. Corresponding rows are in the same table of both databases and have
+        /// the same primary key in both databases. The tables of non-conflicting databases must have
+        /// the same number of primary keys, same number of columns, same column types, same column names,
+        /// and the same data in rows with identical primary keys. Temporary columns however don't matter
+        /// in the column count and corresponding tables can have a different number of temporary columns
+        /// without creating conflict as long as the persistent columns match.
+        /// </p><p>
+        /// If the number, type, or name of columns in corresponding tables are different, the
+        /// schema of the two databases are incompatible and the installer will stop processing tables
+        /// and the merge fails. The installer checks that the two databases have the same schema before
+        /// checking for row merge conflicts. If the schemas are incompatible, the databases have be
+        /// modified.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabasemerge.asp">MsiDatabaseMerge</a>
+        /// </p></remarks>
+        public void Merge(Database otherDatabase) { this.Merge(otherDatabase, null); }
+
+        /// <summary>
+        /// Checks whether a table exists and is persistent in the database.
+        /// </summary>
+        /// <param name="table">The table to the checked</param>
+        /// <returns>true if the table exists and is persistent in the database; false otherwise</returns>
+        /// <exception cref="ArgumentException">the table is unknown</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// To check whether a table exists regardless of persistence,
+        /// use <see cref="TableCollection.Contains"/>.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseistablepersistent.asp">MsiDatabaseIsTablePersistent</a>
+        /// </p></remarks>
+        public bool IsTablePersistent(string table)
+        {
+            if (String.IsNullOrEmpty(table))
+            {
+                throw new ArgumentNullException("table");
+            }
+            uint ret = RemotableNativeMethods.MsiDatabaseIsTablePersistent((int) this.Handle, table);
+            if (ret == 3)  // MSICONDITION_ERROR
+            {
+                throw new InstallerException();
+            }
+            return ret == 1;
+        }
+
+        /// <summary>
+        /// Checks whether a table contains a persistent column with a given name.
+        /// </summary>
+        /// <param name="table">The table to the checked</param>
+        /// <param name="column">The name of the column to be checked</param>
+        /// <returns>true if the column exists in the table; false if the column is temporary or does not exist.</returns>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// To check whether a column exists regardless of persistence,
+        /// use <see cref="ColumnCollection.Contains"/>.
+        /// </p></remarks>
+        public bool IsColumnPersistent(string table, string column)
+        {
+            if (String.IsNullOrEmpty(table))
+            {
+                throw new ArgumentNullException("table");
+            }
+            if (String.IsNullOrEmpty(column))
+            {
+                throw new ArgumentNullException("column");
+            }
+            using (View view = this.OpenView(
+                "SELECT `Number` FROM `_Columns` WHERE `Table` = '{0}' AND `Name` = '{1}'", table, column))
+            {
+                view.Execute();
+                using (Record rec = view.Fetch())
+                {
+                    return (rec != null);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the count of all rows in the table.
+        /// </summary>
+        /// <param name="table">Name of the table whose rows are to be counted</param>
+        /// <returns>The count of all rows in the table</returns>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        public int CountRows(string table)
+        {
+            return this.CountRows(table, null);
+        }
+
+        /// <summary>
+        /// Gets the count of all rows in the table that satisfy a given condition.
+        /// </summary>
+        /// <param name="table">Name of the table whose rows are to be counted</param>
+        /// <param name="where">Conditional expression, such as could be placed on the end of a SQL WHERE clause</param>
+        /// <returns>The count of all rows in the table satisfying the condition</returns>
+        /// <exception cref="BadQuerySyntaxException">the SQL WHERE syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        public int CountRows(string table, string where)
+        {
+            if (String.IsNullOrEmpty(table))
+            {
+                throw new ArgumentNullException("table");
+            }
+
+            // to support temporary tables like _Streams, run the query even if the table isn't persistent
+            TableInfo tableInfo = this.Tables[table];
+            string primaryKeys = tableInfo == null ? "*" : String.Concat("`", tableInfo.PrimaryKeys[0], "`");
+            int count;
+
+            try
+            {
+                using (View view = this.OpenView(
+                    "SELECT {0} FROM `{1}`{2}",
+                    primaryKeys,
+                    table,
+                    (where != null && where.Length != 0 ? " WHERE " + where : "")))
+                {
+                    view.Execute();
+                    for (count = 0; ; count++)
+                    {
+                        // Avoid creating unnecessary Record objects by not calling View.Fetch().
+                        int recordHandle;
+                        uint ret = RemotableNativeMethods.MsiViewFetch((int)view.Handle, out recordHandle);
+                        if (ret == (uint)NativeMethods.Error.NO_MORE_ITEMS)
+                        {
+                            break;
+                        }
+
+                        if (ret != 0)
+                        {
+                            throw InstallerException.ExceptionFromReturnCode(ret);
+                        }
+
+                        RemotableNativeMethods.MsiCloseHandle(recordHandle);
+                    }
+                }
+            }
+            catch (BadQuerySyntaxException)
+            {
+                // table was missing
+                count = 0;
+            }
+
+            return count;
+        }
+
+        /// <summary>
+        /// Finalizes the persistent form of the database. All persistent data is written
+        /// to the writeable database, and no temporary columns or rows are written.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// For a database open in <see cref="DatabaseOpenMode.ReadOnly"/> mode, this method has no effect.
+        /// </p><p>
+        /// For a database open in <see cref="DatabaseOpenMode.CreateDirect" /> or <see cref="DatabaseOpenMode.Direct" />
+        /// mode, it is not necessary to call this method because the database will be automatically committed
+        /// when it is closed. However this method may be called at any time to persist the current state of tables
+        /// loaded into memory.
+        /// </p><p>
+        /// For a database open in <see cref="DatabaseOpenMode.Create" /> or <see cref="DatabaseOpenMode.Transact" />
+        /// mode, no changes will be persisted until this method is called. If the database object is closed without
+        /// calling this method, the database file remains unmodified.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabasecommit.asp">MsiDatabaseCommit</a>
+        /// </p></remarks>
+        public void Commit()
+        {
+            if (this.summaryInfo != null && !this.summaryInfo.IsClosed)
+            {
+                this.summaryInfo.Persist();
+                this.summaryInfo.Close();
+                this.summaryInfo = null;
+            }
+            uint ret = NativeMethods.MsiDatabaseCommit((int) this.Handle);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Copies the structure and data from a specified table to a text archive file.
+        /// </summary>
+        /// <param name="table">Name of the table to be exported</param>
+        /// <param name="exportFilePath">Path to the file to be created</param>
+        /// <exception cref="FileNotFoundException">the file path is invalid</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseexport.asp">MsiDatabaseExport</a>
+        /// </p></remarks>
+        public void Export(string table, string exportFilePath)
+        {
+            if (table == null)
+            {
+                throw new ArgumentNullException("table");
+            }
+
+            FileInfo file = new FileInfo(exportFilePath);
+            uint ret = NativeMethods.MsiDatabaseExport((int) this.Handle, table, file.DirectoryName, file.Name);
+            if (ret != 0)
+            {
+                if (ret == (uint) NativeMethods.Error.BAD_PATHNAME)
+                {
+                    throw new FileNotFoundException(null, exportFilePath);
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Imports a database table from a text archive file, dropping any existing table.
+        /// </summary>
+        /// <param name="importFilePath">Path to the file to be imported. 
+        /// The table name is specified within the file.</param>
+        /// <exception cref="FileNotFoundException">the file path is invalid</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseimport.asp">MsiDatabaseImport</a>
+        /// </p></remarks>
+        public void Import(string importFilePath)
+        {
+            if (String.IsNullOrEmpty(importFilePath))
+            {
+                throw new ArgumentNullException("importFilePath");
+            }
+
+            FileInfo file = new FileInfo(importFilePath);
+            uint ret = NativeMethods.MsiDatabaseImport((int) this.Handle, file.DirectoryName, file.Name);
+            if (ret != 0)
+            {
+                if (ret == (uint) NativeMethods.Error.BAD_PATHNAME)
+                {
+                    throw new FileNotFoundException(null, importFilePath);
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Exports all database tables, streams, and summary information to archive files.
+        /// </summary>
+        /// <param name="directoryPath">Path to the directory where archive files will be created</param>
+        /// <exception cref="FileNotFoundException">the directory path is invalid</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// The directory will be created if it does not already exist.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseexport.asp">MsiDatabaseExport</a>
+        /// </p></remarks>
+        public void ExportAll(string directoryPath)
+        {
+            if (String.IsNullOrEmpty(directoryPath))
+            {
+                throw new ArgumentNullException("directoryPath");
+            }
+
+            if (!Directory.Exists(directoryPath))
+            {
+                Directory.CreateDirectory(directoryPath);
+            }
+
+            this.Export("_SummaryInformation", Path.Combine(directoryPath, "_SummaryInformation.idt"));
+
+            using (View view = this.OpenView("SELECT `Name` FROM `_Tables`"))
+            {
+                view.Execute();
+
+                foreach (Record rec in view) using (rec)
+                {
+                    string table = (string) rec[1];
+
+                    this.Export(table, Path.Combine(directoryPath, table + ".idt"));
+                }
+            }
+
+            if (!Directory.Exists(Path.Combine(directoryPath, "_Streams")))
+            {
+                Directory.CreateDirectory(Path.Combine(directoryPath, "_Streams"));
+            }
+
+            using (View view = this.OpenView("SELECT `Name`, `Data` FROM `_Streams`"))
+            {
+                view.Execute();
+
+                foreach (Record rec in view) using (rec)
+                {
+                    string stream = (string) rec[1];
+                    if (stream.EndsWith("SummaryInformation", StringComparison.Ordinal)) continue;
+
+                    int i = stream.IndexOf('.');
+                    if (i >= 0) 
+                    {
+                        if (File.Exists(Path.Combine(
+                            directoryPath,
+                            Path.Combine(stream.Substring(0, i), stream.Substring(i + 1) + ".ibd"))))
+                        {
+                            continue;
+                        }
+                    }
+                    rec.GetStream(2, Path.Combine(directoryPath, Path.Combine("_Streams", stream)));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Imports all database tables, streams, and summary information from archive files.
+        /// </summary>
+        /// <param name="directoryPath">Path to the directory from which archive files will be imported</param>
+        /// <exception cref="FileNotFoundException">the directory path is invalid</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseimport.asp">MsiDatabaseImport</a>
+        /// </p></remarks>
+        public void ImportAll(string directoryPath)
+        {
+            if (String.IsNullOrEmpty(directoryPath))
+            {
+                throw new ArgumentNullException("directoryPath");
+            }
+
+            if (File.Exists(Path.Combine(directoryPath, "_SummaryInformation.idt")))
+            {
+                this.Import(Path.Combine(directoryPath, "_SummaryInformation.idt"));
+            }
+
+            string[] idtFiles = Directory.GetFiles(directoryPath, "*.idt");
+            foreach (string file in idtFiles)
+            {
+                if (Path.GetFileName(file) != "_SummaryInformation.idt")
+                {
+                    this.Import(file);
+                }
+            }
+
+            if (Directory.Exists(Path.Combine(directoryPath, "_Streams")))
+            {
+                View view = this.OpenView("SELECT `Name`, `Data` FROM `_Streams`");
+                Record rec = null;
+                try
+                {
+                    view.Execute();
+                    string[] streamFiles = Directory.GetFiles(Path.Combine(directoryPath, "_Streams"));
+                    foreach (string file in streamFiles)
+                    {
+                        rec = this.CreateRecord(2);
+                        rec[1] = Path.GetFileName(file);
+                        rec.SetStream(2, file);
+                        view.Insert(rec);
+                        rec.Close();
+                        rec = null;
+                    }
+                }
+                finally
+                {
+                    if (rec != null) rec.Close();
+                    view.Close();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates a new record object with the requested number of fields.
+        /// </summary>
+        /// <param name="fieldCount">Required number of fields, which may be 0.
+        /// The maximum number of fields in a record is limited to 65535.</param>
+        /// <returns>A new record object that can be used with the database.</returns>
+        /// <remarks><p>
+        /// This method is equivalent to directly calling the <see cref="Record" />
+        /// constructor in all cases outside of a custom action context. When in a
+        /// custom action session, this method allows creation of a record that can
+        /// work with a database other than the session database.
+        /// </p><p>
+        /// The Record object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// It is best that the handle be closed manually as soon as it is no longer
+        /// needed, as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msicreaterecord.asp">MsiCreateRecord</a>
+        /// </p></remarks>
+        public Record CreateRecord(int fieldCount)
+        {
+            int hRecord = RemotableNativeMethods.MsiCreateRecord((uint) fieldCount, (int) this.Handle);
+            return new Record((IntPtr) hRecord, true, (View) null);
+        }
+
+        /// <summary>
+        /// Returns the file path of this database, or the handle value if a file path was not specified.
+        /// </summary>
+        public override string ToString()
+        {
+            if (this.FilePath != null)
+            {
+                return this.FilePath;
+            }
+            else
+            {
+                return "#" + ((int) this.Handle).ToString(CultureInfo.InvariantCulture);
+            }
+        }
+
+        /// <summary>
+        /// Closes the database handle.  After closing a handle, further method calls may throw <see cref="InvalidHandleException"/>.
+        /// </summary>
+        /// <param name="disposing">If true, the method has been called directly or
+        /// indirectly by a user's code, so managed and unmanaged resources will be
+        /// disposed. If false, only unmanaged resources will be disposed.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (!this.IsClosed &&
+                (this.OpenMode == DatabaseOpenMode.CreateDirect ||
+                 this.OpenMode == DatabaseOpenMode.Direct))
+            {
+                // Always commit a direct-opened database before closing.
+                // This avoids unexpected corruption of the database.
+                this.Commit();
+            }
+
+            base.Dispose(disposing);
+
+            if (disposing)
+            {
+                if (this.summaryInfo != null)
+                {
+                    this.summaryInfo.Close();
+                    this.summaryInfo = null;
+                }
+
+                if (this.deleteOnClose != null)
+                {
+                    foreach (string path in this.deleteOnClose)
+                    {
+                        try
+                        {
+                            if (Directory.Exists(path))
+                            {
+                                Directory.Delete(path, true);
+                            }
+                            else
+                            {
+                                if (File.Exists(path)) File.Delete(path);
+                            }
+                        }
+                        catch (IOException)
+                        {
+                        }
+                        catch (UnauthorizedAccessException)
+                        {
+                        }
+                    }
+                    this.deleteOnClose = null;
+                }
+            }
+        }
+
+        private static int Open(string filePath, string outputPath)
+        {
+            if (String.IsNullOrEmpty(filePath))
+            {
+                throw new ArgumentNullException("filePath");
+            }
+
+            if (String.IsNullOrEmpty(outputPath))
+            {
+                throw new ArgumentNullException("outputPath");
+            }
+
+            int hDb;
+            uint ret = NativeMethods.MsiOpenDatabase(filePath, outputPath, out hDb);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return hDb;
+        }
+
+        private static int Open(string filePath, DatabaseOpenMode mode)
+        {
+            if (String.IsNullOrEmpty(filePath))
+            {
+                throw new ArgumentNullException("filePath");
+            }
+
+            if (Path.GetExtension(filePath).Equals(".msp", StringComparison.Ordinal))
+            {
+                const int DATABASEOPENMODE_PATCH = 32;
+                int patchMode = (int) mode | DATABASEOPENMODE_PATCH;
+                mode = (DatabaseOpenMode) patchMode;
+            }
+
+            int hDb;
+            uint ret = NativeMethods.MsiOpenDatabase(filePath, (IntPtr) mode, out hDb);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(
+                    ret,
+                    String.Format(CultureInfo.InvariantCulture, "Database=\"{0}\"", filePath));
+            }
+            return hDb;
+        }
+
+        /// <summary>
+        /// Returns the value of the specified property.
+        /// </summary>
+        /// <param name="property">Name of the property to retrieve.</param>
+        public string ExecutePropertyQuery(string property)
+        {
+            IList<string> values = this.ExecuteStringQuery("SELECT `Value` FROM `Property` WHERE `Property` = '{0}'", property);
+            return (values.Count > 0 ? values[0] : null);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/DatabaseQuery.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/DatabaseQuery.cs
new file mode 100644
index 00000000..7c9e011e
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/DatabaseQuery.cs
@@ -0,0 +1,412 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    public partial class Database
+    {
+        /// <summary>
+        /// Gets a View object representing the query specified by a SQL string.
+        /// </summary>
+        /// <param name="sqlFormat">SQL query string, which may contain format items</param>
+        /// <param name="args">Zero or more objects to format</param>
+        /// <returns>A View object representing the query specified by a SQL string</returns>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// The <paramref name="sqlFormat"/> parameter is formatted using <see cref="String.Format(string,object[])"/>.
+        /// </p><p>
+        /// The View object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// It is best that the handle be closed manually as soon as it is no longer
+        /// needed, as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>
+        /// </p></remarks>
+        public View OpenView(string sqlFormat, params object[] args)
+        {
+            if (String.IsNullOrEmpty(sqlFormat))
+            {
+                throw new ArgumentNullException("sqlFormat");
+            }
+
+            string sql = (args == null || args.Length == 0 ? sqlFormat :
+                String.Format(CultureInfo.InvariantCulture, sqlFormat, args));
+            int viewHandle;
+            uint ret = RemotableNativeMethods.MsiDatabaseOpenView((int) this.Handle, sql, out viewHandle);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+
+            return new View((IntPtr) viewHandle, sql, this);
+        }
+
+        /// <summary>
+        /// Executes the query specified by a SQL string.  The query may not be a SELECT statement.
+        /// </summary>
+        /// <param name="sqlFormat">SQL query string, which may contain format items</param>
+        /// <param name="args">Zero or more objects to format</param>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// The <paramref name="sqlFormat"/> parameter is formatted using
+        /// <see cref="String.Format(string,object[])"/>.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>
+        /// </p></remarks>
+        public void Execute(string sqlFormat, params object[] args)
+        {
+            if (String.IsNullOrEmpty(sqlFormat))
+            {
+                throw new ArgumentNullException("sqlFormat");
+            }
+
+            this.Execute(
+                args == null || args.Length == 0 ?
+                    sqlFormat : String.Format(CultureInfo.InvariantCulture, sqlFormat, args),
+                (Record) null);
+        }
+
+        /// <summary>
+        /// Executes the query specified by a SQL string.  The query may not be a SELECT statement.
+        /// </summary>
+        /// <param name="sql">SQL query string</param>
+        /// <param name="record">Optional Record object containing the values that replace
+        /// the parameter tokens (?) in the SQL query.</param>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>
+        /// </p></remarks>
+        public void Execute(string sql, Record record)
+        {
+            if (String.IsNullOrEmpty(sql))
+            {
+                throw new ArgumentNullException("sql");
+            }
+
+            using (View view = this.OpenView(sql))
+            {
+                view.Execute(record);
+            }
+        }
+
+        /// <summary>
+        /// Executes the specified SQL SELECT query and returns all results.
+        /// </summary>
+        /// <param name="sqlFormat">SQL query string, which may contain format items</param>
+        /// <param name="args">Zero or more objects to format</param>
+        /// <returns>All results combined into an array</returns>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// The <paramref name="sqlFormat"/> parameter is formatted using
+        /// <see cref="String.Format(string,object[])"/>.
+        /// </p><p>
+        /// Multiple rows columns will be collapsed into a single one-dimensional list.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewfetch.asp">MsiViewFetch</a>
+        /// </p></remarks>
+        public IList ExecuteQuery(string sqlFormat, params object[] args)
+        {
+            if (String.IsNullOrEmpty(sqlFormat))
+            {
+                throw new ArgumentNullException("sqlFormat");
+            }
+
+            return this.ExecuteQuery(
+                args == null || args.Length == 0 ?
+                    sqlFormat : String.Format(CultureInfo.InvariantCulture, sqlFormat, args),
+                (Record) null);
+        }
+
+        /// <summary>
+        /// Executes the specified SQL SELECT query and returns all results.
+        /// </summary>
+        /// <param name="sql">SQL SELECT query string</param>
+        /// <param name="record">Optional Record object containing the values that replace
+        /// the parameter tokens (?) in the SQL query.</param>
+        /// <returns>All results combined into an array</returns>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Multiple rows columns will be collapsed into a single one-dimensional list.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewfetch.asp">MsiViewFetch</a>
+        /// </p></remarks>
+        public IList ExecuteQuery(string sql, Record record)
+        {
+            if (String.IsNullOrEmpty(sql))
+            {
+                throw new ArgumentNullException("sql");
+            }
+
+            using (View view = this.OpenView(sql))
+            {
+                view.Execute(record);
+                IList results = new ArrayList();
+                int fieldCount = 0;
+
+                foreach (Record rec in view) using (rec)
+                {
+                    if (fieldCount == 0) fieldCount = rec.FieldCount;
+                    for (int i = 1; i <= fieldCount; i++)
+                    {
+                        results.Add(rec[i]);
+                    }
+                }
+
+                return results;
+            }
+        }
+
+        /// <summary>
+        /// Executes the specified SQL SELECT query and returns all results as integers.
+        /// </summary>
+        /// <param name="sqlFormat">SQL query string, which may contain format items</param>
+        /// <param name="args">Zero or more objects to format</param>
+        /// <returns>All results combined into an array</returns>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// The <paramref name="sqlFormat"/> parameter is formatted using
+        /// <see cref="String.Format(string,object[])"/>.
+        /// </p><p>
+        /// Multiple rows columns will be collapsed into a single one-dimensional list.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewfetch.asp">MsiViewFetch</a>
+        /// </p></remarks>
+        public IList<int> ExecuteIntegerQuery(string sqlFormat, params object[] args)
+        {
+            if (String.IsNullOrEmpty(sqlFormat))
+            {
+                throw new ArgumentNullException("sqlFormat");
+            }
+
+            return this.ExecuteIntegerQuery(
+                args == null || args.Length == 0 ?
+                    sqlFormat : String.Format(CultureInfo.InvariantCulture, sqlFormat, args),
+                (Record) null);
+        }
+
+        /// <summary>
+        /// Executes the specified SQL SELECT query and returns all results as integers.
+        /// </summary>
+        /// <param name="sql">SQL SELECT query string</param>
+        /// <param name="record">Optional Record object containing the values that replace
+        /// the parameter tokens (?) in the SQL query.</param>
+        /// <returns>All results combined into an array</returns>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Multiple rows columns will be collapsed into a single one-dimensional list.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewfetch.asp">MsiViewFetch</a>
+        /// </p></remarks>
+        public IList<int> ExecuteIntegerQuery(string sql, Record record)
+        {
+            if (String.IsNullOrEmpty(sql))
+            {
+                throw new ArgumentNullException("sql");
+            }
+
+            using (View view = this.OpenView(sql))
+            {
+                view.Execute(record);
+                IList<int> results = new List<int>();
+                int fieldCount = 0;
+
+                foreach (Record rec in view) using (rec)
+                {
+                    if (fieldCount == 0) fieldCount = rec.FieldCount;
+                    for (int i = 1; i <= fieldCount; i++)
+                    {
+                        results.Add(rec.GetInteger(i));
+                    }
+                }
+
+                return results;
+            }
+        }
+
+        /// <summary>
+        /// Executes the specified SQL SELECT query and returns all results as strings.
+        /// </summary>
+        /// <param name="sqlFormat">SQL query string, which may contain format items</param>
+        /// <param name="args">Zero or more objects to format</param>
+        /// <returns>All results combined into an array</returns>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// The <paramref name="sqlFormat"/> parameter is formatted using
+        /// <see cref="String.Format(string,object[])"/>.
+        /// </p><p>
+        /// Multiple rows columns will be collapsed into a single on-dimensional list.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewfetch.asp">MsiViewFetch</a>
+        /// </p></remarks>
+        public IList<string> ExecuteStringQuery(string sqlFormat, params object[] args)
+        {
+            if (String.IsNullOrEmpty(sqlFormat))
+            {
+                throw new ArgumentNullException("sqlFormat");
+            }
+
+            return this.ExecuteStringQuery(
+                args == null || args.Length == 0 ?
+                    sqlFormat : String.Format(CultureInfo.InvariantCulture, sqlFormat, args),
+                (Record) null);
+        }
+
+        /// <summary>
+        /// Executes the specified SQL SELECT query and returns all results as strings.
+        /// </summary>
+        /// <param name="sql">SQL SELECT query string</param>
+        /// <param name="record">Optional Record object containing the values that replace
+        /// the parameter tokens (?) in the SQL query.</param>
+        /// <returns>All results combined into an array</returns>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Multiple rows columns will be collapsed into a single on-dimensional list.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewfetch.asp">MsiViewFetch</a>
+        /// </p></remarks>
+        public IList<string> ExecuteStringQuery(string sql, Record record)
+        {
+            if (String.IsNullOrEmpty(sql))
+            {
+                throw new ArgumentNullException("sql");
+            }
+
+            using (View view = this.OpenView(sql))
+            {
+                view.Execute(record);
+                IList<string> results = new List<string>();
+                int fieldCount = 0;
+
+                foreach (Record rec in view) using (rec)
+                {
+                    if (fieldCount == 0) fieldCount = rec.FieldCount;
+                    for (int i = 1; i <= fieldCount; i++)
+                    {
+                        results.Add(rec.GetString(i));
+                    }
+                }
+
+                return results;
+            }
+        }
+
+        /// <summary>
+        /// Executes the specified SQL SELECT query and returns a single result.
+        /// </summary>
+        /// <param name="sqlFormat">SQL query string, which may contain format items</param>
+        /// <param name="args">Zero or more objects to format</param>
+        /// <returns>First field of the first result</returns>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed
+        /// or the query returned 0 results</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// The <paramref name="sqlFormat"/> parameter is formatted using
+        /// <see cref="String.Format(string,object[])"/>.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewfetch.asp">MsiViewFetch</a>
+        /// </p></remarks>
+        public object ExecuteScalar(string sqlFormat, params object[] args)
+        {
+            if (String.IsNullOrEmpty(sqlFormat))
+            {
+                throw new ArgumentNullException("sqlFormat");
+            }
+
+            return this.ExecuteScalar(
+                args == null || args.Length == 0 ?
+                    sqlFormat : String.Format(CultureInfo.InvariantCulture, sqlFormat, args),
+                (Record) null);
+        }
+
+        /// <summary>
+        /// Executes the specified SQL SELECT query and returns a single result.
+        /// </summary>
+        /// <param name="sql">SQL SELECT query string</param>
+        /// <param name="record">Optional Record object containing the values that replace
+        /// the parameter tokens (?) in the SQL query.</param>
+        /// <returns>First field of the first result</returns>
+        /// <exception cref="BadQuerySyntaxException">the SQL syntax is invalid</exception>
+        /// <exception cref="InstallerException">the View could not be executed
+        /// or the query returned 0 results</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseopenview.asp">MsiDatabaseOpenView</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewfetch.asp">MsiViewFetch</a>
+        /// </p></remarks>
+        public object ExecuteScalar(string sql, Record record)
+        {
+            if (String.IsNullOrEmpty(sql))
+            {
+                throw new ArgumentNullException("sql");
+            }
+
+            View view = this.OpenView(sql);
+            Record rec = null;
+            try
+            {
+                view.Execute(record);
+                rec = view.Fetch();
+                if (rec == null)
+                {
+                    throw InstallerException.ExceptionFromReturnCode((uint) NativeMethods.Error.NO_MORE_ITEMS);
+                }
+                return rec[1];
+            }
+            finally
+            {
+                if (rec != null) rec.Close();
+                view.Close();
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/DatabaseTransform.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/DatabaseTransform.cs
new file mode 100644
index 00000000..fa843012
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/DatabaseTransform.cs
@@ -0,0 +1,278 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    public partial class Database
+    {
+        /// <summary>
+        /// Creates a transform that, when applied to the object database, results in the reference database.
+        /// </summary>
+        /// <param name="referenceDatabase">Database that does not include the changes</param>
+        /// <param name="transformFile">Name of the generated transform file, or null to only
+        /// check whether or not the two database are identical</param>
+        /// <returns>true if a transform is generated, or false if a transform is not generated
+        /// because there are no differences between the two databases.</returns>
+        /// <exception cref="InstallerException">the transform could not be generated</exception>
+        /// <exception cref="InvalidHandleException">a Database handle is invalid</exception>
+        /// <remarks><p>
+        /// A transform can add non-primary key columns to the end of a table. A transform cannot
+        /// be created that adds primary key columns to a table. A transform cannot be created that
+        /// changes the order, names, or definitions of columns.
+        /// </p><p>
+        /// If the transform is to be applied during an installation you must use the
+        /// <see cref="Database.CreateTransformSummaryInfo"/> method to populate the
+        /// summary information stream.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabasegeneratetransform.asp">MsiDatabaseGenerateTransform</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public bool GenerateTransform(Database referenceDatabase, string transformFile)
+        {
+            if (referenceDatabase == null)
+            {
+                throw new ArgumentNullException("referenceDatabase");
+            }
+
+            if (String.IsNullOrEmpty(transformFile))
+            {
+                throw new ArgumentNullException("transformFile");
+            }
+
+            uint ret = NativeMethods.MsiDatabaseGenerateTransform((int) this.Handle, (int) referenceDatabase.Handle, transformFile, 0, 0);
+            if (ret == (uint) NativeMethods.Error.NO_DATA)
+            {
+                return false;
+            }
+            else if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Creates and populates the summary information stream of an existing transform file, and
+        /// fills in the properties with the base and reference ProductCode and ProductVersion.
+        /// </summary>
+        /// <param name="referenceDatabase">Database that does not include the changes</param>
+        /// <param name="transformFile">Name of the generated transform file</param>
+        /// <param name="errors">Error conditions that should be suppressed
+        /// when the transform is applied</param>
+        /// <param name="validations">Defines which properties should be validated
+        /// to verify that this transform can be applied to a database.</param>
+        /// <exception cref="InstallerException">the transform summary info could not be
+        /// generated</exception>
+        /// <exception cref="InvalidHandleException">a Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msicreatetransformsummaryinfo.asp">MsiCreateTransformSummaryInfo</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public void CreateTransformSummaryInfo(
+            Database referenceDatabase,
+            string transformFile,
+            TransformErrors errors,
+            TransformValidations validations)
+        {
+            if (referenceDatabase == null)
+            {
+                throw new ArgumentNullException("referenceDatabase");
+            }
+
+            if (String.IsNullOrEmpty(transformFile))
+            {
+                throw new ArgumentNullException("transformFile");
+            }
+
+            uint ret = NativeMethods.MsiCreateTransformSummaryInfo(
+                (int) this.Handle,
+                (int) referenceDatabase.Handle,
+                transformFile,
+                (int) errors,
+                (int) validations);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Apply a transform to the database, recording the changes in the "_TransformView" table.
+        /// </summary>
+        /// <param name="transformFile">Path to the transform file</param>
+        /// <exception cref="InstallerException">the transform could not be applied</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseapplytransform.asp">MsiDatabaseApplyTransform</a>
+        /// </p></remarks>
+        public void ViewTransform(string transformFile)
+        {
+            TransformErrors transformErrors =
+                TransformErrors.AddExistingRow |
+                TransformErrors.DelMissingRow |
+                TransformErrors.AddExistingTable |
+                TransformErrors.DelMissingTable |
+                TransformErrors.UpdateMissingRow |
+                TransformErrors.ChangeCodePage |
+                TransformErrors.ViewTransform;
+            this.ApplyTransform(transformFile, transformErrors);
+        }
+
+        /// <summary>
+        /// Apply a transform to the database, suppressing any error conditions
+        /// specified by the transform's summary information.
+        /// </summary>
+        /// <param name="transformFile">Path to the transform file</param>
+        /// <exception cref="InstallerException">the transform could not be applied</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseapplytransform.asp">MsiDatabaseApplyTransform</a>
+        /// </p></remarks>
+        public void ApplyTransform(string transformFile)
+        {
+            if (String.IsNullOrEmpty(transformFile))
+            {
+                throw new ArgumentNullException("transformFile");
+            }
+
+            TransformErrors errorConditionsToSuppress;
+            using (SummaryInfo transformSummInfo = new SummaryInfo(transformFile, false))
+            {
+                int errorConditions = transformSummInfo.CharacterCount & 0xFFFF;
+                errorConditionsToSuppress = (TransformErrors) errorConditions;
+            }
+            this.ApplyTransform(transformFile, errorConditionsToSuppress);
+        }
+
+        /// <summary>
+        /// Apply a transform to the database, specifying error conditions to suppress.
+        /// </summary>
+        /// <param name="transformFile">Path to the transform file</param>
+        /// <param name="errorConditionsToSuppress">Error conditions that are to be suppressed</param>
+        /// <exception cref="InstallerException">the transform could not be applied</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidatabaseapplytransform.asp">MsiDatabaseApplyTransform</a>
+        /// </p></remarks>
+        public void ApplyTransform(string transformFile, TransformErrors errorConditionsToSuppress)
+        {
+            if (String.IsNullOrEmpty(transformFile))
+            {
+                throw new ArgumentNullException("transformFile");
+            }
+
+            uint ret = NativeMethods.MsiDatabaseApplyTransform((int) this.Handle, transformFile, (int) errorConditionsToSuppress);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether a transform is valid for this Database, according to its validation data and flags.
+        /// </summary>
+        /// <param name="transformFile">Path to the transform file</param>
+        /// <returns>true if the transform can be validly applied to this Database; false otherwise</returns>
+        /// <exception cref="InstallerException">the transform could not be applied</exception>
+        /// <exception cref="InvalidHandleException">the Database handle is invalid</exception>
+        public bool IsTransformValid(string transformFile)
+        {
+            if (String.IsNullOrEmpty(transformFile))
+            {
+                throw new ArgumentNullException("transformFile");
+            }
+
+            using (SummaryInfo transformSummInfo = new SummaryInfo(transformFile, false))
+            {
+                return this.IsTransformValid(transformSummInfo);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether a transform is valid for this Database, according to its SummaryInfo data.
+        /// </summary>
+        /// <param name="transformSummaryInfo">SummaryInfo data of a transform file</param>
+        /// <returns>true if the transform can be validly applied to this Database; false otherwise</returns>
+        /// <exception cref="InstallerException">error processing summary info</exception>
+        /// <exception cref="InvalidHandleException">the Database or SummaryInfo handle is invalid</exception>
+        public bool IsTransformValid(SummaryInfo transformSummaryInfo)
+        {
+            if (transformSummaryInfo == null)
+            {
+                throw new ArgumentNullException("transformSummaryInfo");
+            }
+
+            string[] rev = transformSummaryInfo.RevisionNumber.Split(new char[] { ';' }, 3);
+            string targetProductCode = rev[0].Substring(0, 38);
+            string targetProductVersion = rev[0].Substring(38);
+            string upgradeCode = rev[2];
+
+            string[] templ = transformSummaryInfo.Template.Split(new char[] { ';' }, 2);
+            int targetProductLanguage = 0;
+            if (templ.Length >= 2 && templ[1].Length > 0)
+            {
+                targetProductLanguage = Int32.Parse(templ[1], CultureInfo.InvariantCulture.NumberFormat);
+            }
+
+            int flags = transformSummaryInfo.CharacterCount;
+            int validateFlags = flags >> 16;
+
+            string thisProductCode = this.ExecutePropertyQuery("ProductCode");
+            string thisProductVersion = this.ExecutePropertyQuery("ProductVersion");
+            string thisUpgradeCode = this.ExecutePropertyQuery("UpgradeCode");
+            string thisProductLang = this.ExecutePropertyQuery("ProductLanguage");
+            int thisProductLanguage = 0;
+            if (!String.IsNullOrEmpty(thisProductLang))
+            {
+                thisProductLanguage = Int32.Parse(thisProductLang, CultureInfo.InvariantCulture.NumberFormat);
+            }
+
+            if ((validateFlags & (int) TransformValidations.Product) != 0 &&
+                thisProductCode != targetProductCode)
+            {
+                return false;
+            }
+
+            if ((validateFlags & (int) TransformValidations.UpgradeCode) != 0 &&
+                thisUpgradeCode != upgradeCode)
+            {
+                return false;
+            }
+
+            if ((validateFlags & (int) TransformValidations.Language) != 0 &&
+                targetProductLanguage != 0 && thisProductLanguage != targetProductLanguage)
+            {
+                return false;
+            }
+
+            Version thisProductVer = new Version(thisProductVersion);
+            Version targetProductVer = new Version(targetProductVersion);
+            if ((validateFlags & (int) TransformValidations.UpdateVersion) != 0)
+            {
+                if (thisProductVer.Major != targetProductVer.Major) return false;
+                if (thisProductVer.Minor != targetProductVer.Minor) return false;
+                if (thisProductVer.Build != targetProductVer.Build) return false;
+            }
+            else if ((validateFlags & (int) TransformValidations.MinorVersion) != 0)
+            {
+                if (thisProductVer.Major != targetProductVer.Major) return false;
+                if (thisProductVer.Minor != targetProductVer.Minor) return false;
+            }
+            else if ((validateFlags & (int) TransformValidations.MajorVersion) != 0)
+            {
+                if (thisProductVer.Major != targetProductVer.Major) return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/EmbeddedUIProxy.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/EmbeddedUIProxy.cs
new file mode 100644
index 00000000..05e910d4
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/EmbeddedUIProxy.cs
@@ -0,0 +1,231 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Collections;
+    using System.Configuration;
+    using System.Diagnostics.CodeAnalysis;
+    using System.IO;
+    using System.Reflection;
+    using System.Runtime.InteropServices;
+    using System.Security;
+    using System.Text;
+
+    /// <summary>
+    /// Managed-code portion of the embedded UI proxy.
+    /// </summary>
+    internal static class EmbeddedUIProxy
+    {
+        private static IEmbeddedUI uiInstance;
+        private static string uiClass;
+
+        private static bool DebugBreakEnabled(string method)
+        {
+            return CustomActionProxy.DebugBreakEnabled(new string[] { method, EmbeddedUIProxy.uiClass + "." + method } );
+        }
+
+        /// <summary>
+        /// Initializes managed embedded UI by loading the UI class and invoking its Initialize method.
+        /// </summary>
+        /// <param name="sessionHandle">Integer handle to the installer session.</param>
+        /// <param name="uiClass">Name of the class that implements the embedded UI. This must
+        /// be of the form: &quot;AssemblyName!Namespace.Class&quot;</param>
+        /// <param name="internalUILevel">On entry, contains the current UI level for the installation. After this
+        /// method returns, the installer resets the UI level to the returned value of this parameter.</param>
+        /// <returns>0 if the embedded UI was successfully loaded and initialized,
+        /// ERROR_INSTALL_USEREXIT if the user canceled the installation during initialization,
+        /// or ERROR_INSTALL_FAILURE if the embedded UI could not be initialized.</returns>
+        /// <remarks>
+        /// Due to interop limitations, the successful resulting UILevel is actually returned
+        /// as the high-word of the return value instead of via a ref parameter.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int Initialize(int sessionHandle, string uiClass, int internalUILevel)
+        {
+            Session session = null;
+
+            try
+            {
+                session = new Session((IntPtr) sessionHandle, false);
+                
+                if (String.IsNullOrEmpty(uiClass))
+                {
+                    throw new ArgumentNullException("uiClass");
+                }
+
+                EmbeddedUIProxy.uiInstance = EmbeddedUIProxy.InstantiateUI(session, uiClass);
+            }
+            catch (Exception ex)
+            {
+                if (session != null)
+                {
+                    try
+                    {
+                        session.Log("Exception while loading embedded UI:");
+                        session.Log(ex.ToString());
+                    }
+                    catch (Exception)
+                    {
+                    }
+                }
+            }
+
+            if (EmbeddedUIProxy.uiInstance == null)
+            {
+                return (int) ActionResult.Failure;
+            }
+
+            try
+            {
+                string resourcePath = Path.GetDirectoryName(EmbeddedUIProxy.uiInstance.GetType().Assembly.Location);
+                InstallUIOptions uiOptions = (InstallUIOptions) internalUILevel;
+                if (EmbeddedUIProxy.DebugBreakEnabled("Initialize"))
+                {
+                    System.Diagnostics.Debugger.Launch();
+                }
+
+                if (EmbeddedUIProxy.uiInstance.Initialize(session, resourcePath, ref uiOptions))
+                {
+                    // The embedded UI initialized and the installation should continue
+                    // with internal UI reset according to options.
+                    return ((int) uiOptions) << 16;
+                }
+                else
+                {
+                    // The embedded UI did not initialize but the installation should still continue
+                    // with internal UI reset according to options.
+                    return (int) uiOptions;
+                }
+            }
+            catch (InstallCanceledException)
+            {
+                // The installation was canceled by the user.
+                return (int) ActionResult.UserExit;
+            }
+            catch (Exception ex)
+            {
+                // An unhandled exception causes the installation to fail immediately.
+                session.Log("Exception thrown by embedded UI initialization:");
+                session.Log(ex.ToString());
+                return (int) ActionResult.Failure;
+            }
+        }
+
+        /// <summary>
+        /// Passes a progress message to the UI class.
+        /// </summary>
+        /// <param name="messageType">Installer message type and message box options.</param>
+        /// <param name="recordHandle">Handle to a record containing message data.</param>
+        /// <returns>Return value returned by the UI class.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        public static int ProcessMessage(int messageType, int recordHandle)
+        {
+            if (EmbeddedUIProxy.uiInstance != null)
+            {
+                try
+                {
+                    int msgType = messageType & 0x7F000000;
+                    int buttons = messageType & 0x0000000F;
+                    int icon = messageType & 0x000000F0;
+                    int defButton = messageType & 0x00000F00;
+
+                    Record msgRec = (recordHandle != 0 ? Record.FromHandle((IntPtr) recordHandle, false) : null);
+                    using (msgRec)
+                    {
+                        if (EmbeddedUIProxy.DebugBreakEnabled("ProcessMessage"))
+                        {
+                            System.Diagnostics.Debugger.Launch();
+                        }
+
+                        return (int) EmbeddedUIProxy.uiInstance.ProcessMessage(
+                            (InstallMessage) msgType,
+                            msgRec,
+                            (MessageButtons) buttons,
+                            (MessageIcon) icon,
+                            (MessageDefaultButton) defButton);
+                    }
+                }
+                catch (Exception)
+                {
+                    // Ignore it... just hope future messages will not throw exceptions.
+                }
+            }
+
+            return 0;
+        }
+
+        /// <summary>
+        /// Passes a shutdown message to the UI class.
+        /// </summary>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        public static void Shutdown()
+        {
+            if (EmbeddedUIProxy.uiInstance != null)
+            {
+                try
+                {
+                    if (EmbeddedUIProxy.DebugBreakEnabled("Shutdown"))
+                    {
+                        System.Diagnostics.Debugger.Launch();
+                    }
+
+                    EmbeddedUIProxy.uiInstance.Shutdown();
+                }
+                catch (Exception)
+                {
+                    // Nothing to do at this point... the installation is done anyway.
+                }
+
+                EmbeddedUIProxy.uiInstance = null;
+            }
+        }
+
+        /// <summary>
+        /// Instantiates a UI class from a given assembly and class name.
+        /// </summary>
+        /// <param name="session">Installer session, for logging.</param>
+        /// <param name="uiClass">Name of the class that implements the embedded UI. This must
+        /// be of the form: &quot;AssemblyName!Namespace.Class&quot;</param>
+        /// <returns>Interface on the UI class for handling UI messages.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        private static IEmbeddedUI InstantiateUI(Session session, string uiClass)
+        {
+            int assemblySplit = uiClass.IndexOf('!');
+            if (assemblySplit < 0)
+            {
+                session.Log("Error: invalid embedded UI assembly and class:" + uiClass);
+                return null;
+            }
+
+            string assemblyName = uiClass.Substring(0, assemblySplit);
+            EmbeddedUIProxy.uiClass = uiClass.Substring(assemblySplit + 1);
+
+            Assembly uiAssembly;
+            try
+            {
+                uiAssembly = AppDomain.CurrentDomain.Load(assemblyName);
+
+                // This calls out to CustomActionProxy.DebugBreakEnabled() directly instead
+                // of calling EmbeddedUIProxy.DebugBreakEnabled() because we don't compose a
+                // class.method name for this breakpoint.
+                if (CustomActionProxy.DebugBreakEnabled(new string[] { "EmbeddedUI" }))
+                {
+                    System.Diagnostics.Debugger.Launch();
+                }
+
+                return (IEmbeddedUI) uiAssembly.CreateInstance(EmbeddedUIProxy.uiClass);
+            }
+            catch (Exception ex)
+            {
+                session.Log("Error: could not load embedded UI class " + EmbeddedUIProxy.uiClass + " from assembly: " + assemblyName);
+                session.Log(ex.ToString());
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Enums.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/Enums.cs
new file mode 100644
index 00000000..64ed0e7f
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Enums.cs
@@ -0,0 +1,909 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+
+    // Enumerations are in alphabetical order.
+
+    /// <summary>
+    /// Specifies a return status value for custom actions.
+    /// </summary>
+    public enum ActionResult : int
+    {
+        /// <summary>Action completed successfully.</summary>
+        Success = 0,
+
+        /// <summary>Skip remaining actions, not an error.</summary>
+        SkipRemainingActions = 259,
+
+        /// <summary>User terminated prematurely.</summary>
+        UserExit = 1602,
+
+        /// <summary>Unrecoverable error or unhandled exception occurred.</summary>
+        Failure = 1603,
+
+        /// <summary>Action not executed.</summary>
+        NotExecuted = 1626,
+    }
+
+    /// <summary>
+    /// Specifies the open mode for a <see cref="Database"/>.
+    /// </summary>
+    public enum DatabaseOpenMode : int
+    {
+        /// <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>
+    /// Log modes available for <see cref="Installer.EnableLog(InstallLogModes,string)"/>
+    /// and <see cref="Installer.SetExternalUI(ExternalUIHandler,InstallLogModes)"/>.
+    /// </summary>
+    [Flags]
+    public enum InstallLogModes : int
+    {
+        /// <summary>Disable logging.</summary>
+        None           = 0,
+
+        /// <summary>Log out of memory or fatal exit information.</summary>
+        FatalExit      = (1 << ((int) InstallMessage.FatalExit      >> 24)),
+
+        /// <summary>Log error messages.</summary>
+        Error          = (1 << ((int) InstallMessage.Error          >> 24)),
+
+        /// <summary>Log warning messages.</summary>
+        Warning        = (1 << ((int) InstallMessage.Warning        >> 24)),
+
+        /// <summary>Log user requests.</summary>
+        User           = (1 << ((int) InstallMessage.User           >> 24)),
+
+        /// <summary>Log status messages that are not displayed.</summary>
+        Info           = (1 << ((int) InstallMessage.Info           >> 24)),
+
+        /// <summary>Log request to determine a valid source location.</summary>
+        ResolveSource  = (1 << ((int) InstallMessage.ResolveSource  >> 24)),
+
+        /// <summary>Log insufficient disk space error.</summary>
+        OutOfDiskSpace = (1 << ((int) InstallMessage.OutOfDiskSpace >> 24)),
+
+        /// <summary>Log the start of installation actions.</summary>
+        ActionStart    = (1 << ((int) InstallMessage.ActionStart    >> 24)),
+
+        /// <summary>Log the data record for installation actions.</summary>
+        ActionData     = (1 << ((int) InstallMessage.ActionData     >> 24)),
+
+        /// <summary>Log parameters for user-interface initialization.</summary>
+        CommonData     = (1 << ((int) InstallMessage.CommonData     >> 24)),
+
+        /// <summary>Log the property values at termination.</summary>
+        PropertyDump   = (1 << ((int) InstallMessage.Progress       >> 24)), // log only
+
+        /// <summary>
+        /// Sends large amounts of information to log file not generally useful to users.
+        /// May be used for support.
+        /// </summary>
+        Verbose        = (1 << ((int) InstallMessage.Initialize     >> 24)), // log only
+
+        /// <summary>
+        /// Log extra debugging information.
+        /// </summary>
+        ExtraDebug     = (1 << ((int) InstallMessage.Terminate      >> 24)), // log only
+
+        /// <summary>
+        /// Log only on error.
+        /// </summary>
+        LogOnlyOnError = (1 << ((int) InstallMessage.ShowDialog     >> 24)), // log only
+
+        /// <summary>
+        /// Log progress bar information. This message includes information on units so far and total number
+        /// of units. See <see cref="Session.Message"/> 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)), // external handler only
+
+        /// <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.Initialize     >> 24)), // external handler only
+
+        /// <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)), // external handler only
+
+        /// <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)), // external handler only
+
+        /// <summary>
+        /// List of files in use that need to be replaced.
+        /// </summary>
+        FilesInUse     = (1 << ((int) InstallMessage.FilesInUse     >> 24)), // external handler only
+
+        /// <summary>
+        /// [MSI 4.0] List of apps that the user can request Restart Manager to shut down and restart.
+        /// </summary>
+        RMFilesInUse   = (1 << ((int) InstallMessage.RMFilesInUse   >> 24)), // external handler only
+    }
+
+    /// <summary>
+    /// Type of message to be processed by <see cref="Session.Message"/>,
+    /// <see cref="ExternalUIHandler"/>, or <see cref="ExternalUIRecordHandler"/>.
+    /// </summary>
+    [SuppressMessage("Microsoft.Design", "CA1027:MarkEnumsWithFlags")]
+    public enum InstallMessage : int
+    {
+        /// <summary>Premature termination, possibly fatal OOM.</summary>
+        FatalExit      = 0x00000000,
+
+        /// <summary>Formatted error message.</summary>
+        Error          = 0x01000000,
+
+        /// <summary>Formatted warning message.</summary>
+        Warning        = 0x02000000,
+
+        /// <summary>User request message.</summary>
+        User           = 0x03000000,
+
+        /// <summary>Informative message for log.</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>Start of action: action name &amp; description.</summary>
+        ActionStart    = 0x08000000,
+
+        /// <summary>Formatted data associated with individual action item.</summary>
+        ActionData     = 0x09000000,
+
+        /// <summary>Progress gauge info: units so far, total.</summary>
+        Progress       = 0x0A000000,
+
+        /// <summary>Product info for dialog: language Id, dialog caption.</summary>
+        CommonData     = 0x0B000000,
+
+        /// <summary>Sent prior to UI initialization, no string data.</summary>
+        Initialize     = 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>[MSI 4.0] List of apps that the user can request Restart Manager to shut down and restart.</summary>
+        RMFilesInUse   = 0x19000000,
+
+        /// <summary>[MSI 4.5] Sent prior to install of a product.</summary>
+        InstallStart   = 0x1A000000,
+
+        /// <summary>[MSI 4.5] Sent after install of a product.</summary>
+        InstallEnd     = 0x1B000000,
+    }
+
+    /// <summary>
+    /// Specifies the install mode for <see cref="Installer.ProvideComponent"/> or <see cref="Installer.ProvideQualifiedComponent"/>.
+    /// </summary>
+    public enum InstallMode : int
+    {
+        /// <summary>Provide the component only if the feature's installation state is <see cref="InstallState.Local"/>.</summary>
+        NoSourceResolution = -3,
+
+        /// <summary>Only check that the component is registered, without verifying that the key file of the component exists.</summary>
+        NoDetection        = -2,
+
+        /// <summary>Provide the component only if the feature exists.</summary>
+        Existing           = -1,
+
+        /// <summary>Provide the component and perform any installation necessary to provide the component.</summary>
+        Default            = 0,
+    }
+
+    /// <summary>
+    /// Specifies the run mode for <see cref="Session.GetMode"/>.
+    /// </summary>
+    [SuppressMessage("Microsoft.Design", "CA1027:MarkEnumsWithFlags")]
+    public enum InstallRunMode : int
+    {
+        /// <summary>The administrative mode is installing, or the product is installing.</summary>
+        Admin           = 0,
+
+        /// <summary>The advertisements are installing or the product is installing or updating.</summary>
+        Advertise       = 1,
+
+        /// <summary>An existing installation is being modified or there is a new installation.</summary>
+        Maintenance     = 2,
+
+        /// <summary>Rollback is enabled.</summary>
+        RollbackEnabled = 3,
+
+        /// <summary>The log file is active. It was enabled prior to the installation session.</summary>
+        LogEnabled      = 4,
+
+        /// <summary>Execute operations are spooling or they are in the determination phase.</summary>
+        Operations      = 5,
+
+        /// <summary>A reboot is necessary after a successful installation (settable).</summary>
+        RebootAtEnd     = 6,
+
+        /// <summary>A reboot is necessary to continue the installation (settable).</summary>
+        RebootNow       = 7,
+
+        /// <summary>Files from cabinets and Media table files are installing.</summary>
+        Cabinet         = 8,
+
+        /// <summary>The source LongFileNames is suppressed through the PID_MSISOURCE summary property.</summary>
+        SourceShortNames = 9,
+
+        /// <summary>The target LongFileNames is suppressed through the SHORTFILENAMES property.</summary>
+        TargetShortNames = 10,
+
+        // <summary>Reserved for future use.</summary>
+        //Reserved11      = 11,
+
+        /// <summary>The operating system is Windows 95, Windows 98, or Windows ME.</summary>
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "x")]
+        Windows9x       = 12,
+
+        /// <summary>The operating system supports demand installation.</summary>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Zaw")]
+        ZawEnabled      = 13,
+
+        // <summary>Reserved for future use.</summary>
+        //Reserved14      = 14,
+
+        // <summary>Reserved for future use.</summary>
+        //Reserved15      = 15,
+
+        /// <summary>A custom action called from install script execution.</summary>
+        Scheduled       = 16,
+
+        /// <summary>A custom action called from rollback execution script.</summary>
+        Rollback        = 17,
+
+        /// <summary>A custom action called from commit execution script.</summary>
+        Commit          = 18,
+    }
+
+    /// <summary>
+    /// Installed state of a Component or Feature.
+    /// </summary>
+    public enum InstallState : int
+    {
+        /// <summary>The component is disabled.</summary>
+        NotUsed        = -7,
+
+        /// <summary>The installation configuration data is corrupt.</summary>
+        BadConfig      = -6,
+
+        /// <summary>The installation is suspended or in progress.</summary>
+        Incomplete     = -5,
+
+        /// <summary>Component is set to run from source, but source is unavailable.</summary>
+        SourceAbsent   = -4,
+
+        /// <summary>The buffer overflow is returned.</summary>
+        MoreData       = -3,
+
+        /// <summary>An invalid parameter was passed to the function.</summary>
+        InvalidArgument = -2,
+
+        /// <summary>An unrecognized product or feature name was passed to the function.</summary>
+        Unknown        = -1,
+
+        /// <summary>The component is broken.</summary>
+        Broken         = 0,
+
+        /// <summary>The feature is advertised.</summary>
+        Advertised     = 1,
+
+        /// <summary>The component is being removed. In action state and not settable.</summary>
+        Removed        = 1,
+
+        /// <summary>The component is not installed, or action state is absent but clients remain.</summary>
+        Absent         = 2,
+
+        /// <summary>The component is installed on the local drive.</summary>
+        Local          = 3,
+
+        /// <summary>The component will run from the source, CD, or network.</summary>
+        Source         = 4,
+
+        /// <summary>The component will be installed in the default location: local or source.</summary>
+        Default        = 5,
+    }
+
+    /// <summary>
+    /// Specifies the type of installation for <see cref="Installer.ApplyPatch(string,string,InstallType,string)"/>.
+    /// </summary>
+    public enum InstallType : int
+    {
+        /// <summary>Searches system for products to patch.</summary>
+        Default = 0,
+
+        /// <summary>Indicates a administrative installation.</summary>
+        NetworkImage = 1,
+
+        /// <summary>Indicates a particular instance.</summary>
+        SingleInstance = 2,
+    }
+
+    /// <summary>
+    /// Level of the installation user interface, specified with
+    /// <see cref="Installer.SetInternalUI(InstallUIOptions)"/>.
+    /// </summary>
+    [SuppressMessage("Microsoft.Design", "CA1008:EnumsShouldHaveZeroValue")]
+    [Flags]
+    public enum InstallUIOptions : int
+    {
+        /// <summary>Does not change UI level.</summary>
+        NoChange     = 0,
+
+        /// <summary>Uses Default UI level.</summary>
+        Default      = 1,
+
+        /// <summary>Silent installation.</summary>
+        Silent       = 2,
+
+        /// <summary>Simple progress and error handling.</summary>
+        Basic        = 3,
+
+        /// <summary>Authored UI, wizard dialogs suppressed.</summary>
+        Reduced      = 4,
+
+        /// <summary>Authored UI with wizards, progress, and errors.</summary>
+        Full         = 5,
+
+        /// <summary>
+        /// When combined with the <see cref="Basic"/> value, the installer does not display
+        /// the cancel button in the progress dialog.
+        /// </summary>
+        HideCancel   = 0x20,
+
+        /// <summary>
+        /// When combined with the <see cref="Basic"/> value, the installer displays progress
+        /// dialog boxes but does not display any modal dialog boxes or error dialog boxes.
+        /// </summary>
+        ProgressOnly = 0x40,
+
+        /// <summary>
+        /// When combined with another 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>
+        /// Forces display of the source resolution dialog even if the UI is otherwise silent.
+        /// </summary>
+        SourceResolutionOnly = 0x100,
+
+        /// <summary>
+        /// [MSI 5.0] Forces display of the UAC dialog even if the UI is otherwise silent.
+        /// </summary>
+        UacOnly = 0x200,
+    }
+
+    /// <summary>
+    /// Specifies a return status value for message handlers.  These values are returned by
+    /// <see cref="Session.Message"/>, <see cref="ExternalUIHandler"/>, and <see cref="IEmbeddedUI.ProcessMessage"/>.
+    /// </summary>
+    public enum MessageResult : int
+    {
+        /// <summary>An error was found in the message handler.</summary>
+        Error  = -1,
+
+        /// <summary>No action was taken.</summary>
+        None   = 0,
+
+        /// <summary>IDOK</summary>
+        [SuppressMessage("Microsoft.Naming", "CA1706:ShortAcronymsShouldBeUppercase")]
+        OK     = 1,
+
+        /// <summary>IDCANCEL</summary>
+        Cancel = 2,
+
+        /// <summary>IDABORT</summary>
+        Abort  = 3,
+
+        /// <summary>IDRETRY</summary>
+        Retry  = 4,
+
+        /// <summary>IDIGNORE</summary>
+        Ignore = 5,
+
+        /// <summary>IDYES</summary>
+        Yes    = 6,
+
+        /// <summary>IDNO</summary>
+        No     = 7,
+    }
+
+    /// <summary>
+    /// Specifies constants defining which buttons to display for a message. This can be cast to
+    /// the MessageBoxButtons enum in System.Windows.Forms and System.Windows.
+    /// </summary>
+    public enum MessageButtons
+    {
+        /// <summary>
+        /// The message contains an OK button.
+        /// </summary>
+        OK = 0,
+
+        /// <summary>
+        /// The message contains OK and Cancel buttons.
+        /// </summary>
+        OKCancel = 1,
+
+        /// <summary>
+        /// The message contains Abort, Retry, and Ignore buttons.
+        /// </summary>
+        AbortRetryIgnore = 2,
+
+        /// <summary>
+        /// The message contains Yes, No, and Cancel buttons.
+        /// </summary>
+        YesNoCancel = 3,
+
+        /// <summary>
+        /// The message contains Yes and No buttons.
+        /// </summary>
+        YesNo = 4,
+
+        /// <summary>
+        /// The message contains Retry and Cancel buttons.
+        /// </summary>
+        RetryCancel = 5,
+    }
+
+    /// <summary>
+    /// Specifies constants defining which information to display. This can be cast to
+    /// the MessageBoxIcon enum in System.Windows.Forms and System.Windows.
+    /// </summary>
+    public enum MessageIcon
+    {
+        /// <summary>
+        /// The message contain no symbols.
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// The message contains a symbol consisting of white X in a circle with a red background.
+        /// </summary>
+        Error = 16,
+
+        /// <summary>
+        /// The message contains a symbol consisting of a white X in a circle with a red background.
+        /// </summary>
+        Hand = 16,
+
+        /// <summary>
+        /// The message contains a symbol consisting of white X in a circle with a red background.
+        /// </summary>
+        Stop = 16,
+
+        /// <summary>
+        /// The message contains a symbol consisting of a question mark in a circle.
+        /// </summary>
+        Question = 32,
+
+        /// <summary>
+        /// The message contains a symbol consisting of an exclamation point in a triangle with a yellow background.
+        /// </summary>
+        Exclamation = 48,
+
+        /// <summary>
+        /// The message contains a symbol consisting of an exclamation point in a triangle with a yellow background.
+        /// </summary>
+        Warning = 48,
+
+        /// <summary>
+        /// The message contains a symbol consisting of a lowercase letter i in a circle.
+        /// </summary>
+        Information = 64,
+
+        /// <summary>
+        /// The message contains a symbol consisting of a lowercase letter i in a circle.
+        /// </summary>
+        Asterisk = 64,
+    }
+
+    /// <summary>
+    /// Specifies constants defining the default button on a message. This can be cast to
+    /// the MessageBoxDefaultButton enum in System.Windows.Forms and System.Windows.
+    /// </summary>
+    public enum MessageDefaultButton
+    {
+        /// <summary>
+        /// The first button on the message is the default button.
+        /// </summary>
+        Button1 = 0,
+
+        /// <summary>
+        /// The second button on the message is the default button.
+        /// </summary>
+        Button2 = 256,
+
+        /// <summary>
+        /// The third button on the message is the default button.
+        /// </summary>
+        Button3 = 512,
+    }
+
+    /// <summary>
+    /// Additional styles for use with message boxes.
+    /// </summary>
+    [Flags]
+    internal enum MessageBoxStyles
+    {
+        /// <summary>
+        /// The message box is created with the WS_EX_TOPMOST window style.
+        /// </summary>
+        TopMost = 0x00040000,
+
+        /// <summary>
+        /// The caller is a service notifying the user of an event.
+        /// The function displays a message box on the current active desktop, even if there is no user logged on to the computer.
+        /// </summary>
+        ServiceNotification = 0x00200000,
+    }
+
+    /// <summary>
+    /// Specifies the different patch states for <see cref="PatchInstallation.GetPatches(string, string, string, UserContexts, PatchStates)"/>.
+    /// </summary>
+    [Flags]
+    public enum PatchStates : int
+    {
+        /// <summary>Invalid value.</summary>
+        None = 0,
+
+        /// <summary>Patches applied to a product.</summary>
+        Applied = 1,
+
+        /// <summary>Patches that are superseded by other patches.</summary>
+        Superseded = 2,
+
+        /// <summary>Patches that are obsolesced by other patches.</summary>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Obsoleted")]
+        Obsoleted = 4,
+
+        /// <summary>Patches that are registered to a product but not applied.</summary>
+        Registered = 8,
+
+        /// <summary>All valid patch states.</summary>
+        All = (Applied | Superseded | Obsoleted | Registered)
+    }
+
+    /// <summary>
+    /// Specifies the reinstall mode for <see cref="Installer.ReinstallFeature"/> or <see cref="Installer.ReinstallProduct"/>.
+    /// </summary>
+    [Flags]
+    public enum ReinstallModes : int
+    {
+        /// <summary>Reinstall only if file is missing.</summary>
+        FileMissing      = 0x00000002,
+
+        /// <summary>Reinstall if file is missing, or older version.</summary>
+        FileOlderVersion = 0x00000004,
+
+        /// <summary>Reinstall if file is missing, or equal or older version.</summary>
+        FileEqualVersion = 0x00000008,
+
+        /// <summary>Reinstall if file is missing, or not exact version.</summary>
+        FileExact        = 0x00000010,
+
+        /// <summary>Checksum executables, reinstall if missing or corrupt.</summary>
+        FileVerify       = 0x00000020,
+
+        /// <summary>Reinstall all files, regardless of version.</summary>
+        FileReplace      = 0x00000040,
+
+        /// <summary>Insure required machine reg entries.</summary>
+        MachineData      = 0x00000080,
+
+        /// <summary>Insure required user reg entries.</summary>
+        UserData         = 0x00000100,
+
+        /// <summary>Validate shortcuts items.</summary>
+        Shortcut         = 0x00000200,
+
+        /// <summary>Use re-cache source install package.</summary>
+        Package          = 0x00000400,
+    }
+
+    /// <summary>
+    /// Attributes for <see cref="Transaction"/> methods.
+    /// </summary>
+    [Flags]
+    public enum TransactionAttributes : int
+    {
+        /// <summary>No attributes.</summary>
+        None                   = 0x00000000,
+
+        /// <summary>Request that the Windows Installer not shutdown the embedded UI until the transaction is complete.</summary>
+        ChainEmbeddedUI        = 0x00000001,
+
+        /// <summary>Request that the Windows Installer transfer the embedded UI from the original installation.</summary>
+        JoinExistingEmbeddedUI = 0x00000002,
+    }
+
+    /// <summary>
+    /// Transform error conditions available for <see cref="Database.CreateTransformSummaryInfo"/> or
+    /// <see cref="Database.ApplyTransform(string,TransformErrors)"/>.
+    /// </summary>
+    [Flags]
+    public enum TransformErrors : int
+    {
+        /// <summary>No error conditions.</summary>
+        None             = 0x0000,
+
+        /// <summary>Adding a row that already exists.</summary>
+        AddExistingRow   = 0x0001,
+
+        /// <summary>Deleting a row that doesn't exist.</summary>
+        DelMissingRow    = 0x0002,
+
+        /// <summary>Adding a table that already exists.</summary>
+        AddExistingTable = 0x0004,
+
+        /// <summary>Deleting a table that doesn't exist.</summary>
+        DelMissingTable  = 0x0008,
+
+        /// <summary>Updating a row that doesn't exist.</summary>
+        UpdateMissingRow = 0x0010,
+
+        /// <summary>Transform and database code pages do not match and neither code page is neutral.</summary>
+        ChangeCodePage   = 0x0020,
+
+        /// <summary>Create the temporary _TransformView table when applying the transform.</summary>
+        ViewTransform    = 0x0100,
+    }
+
+    /// <summary>
+    /// Transform validation flags available for <see cref="Database.CreateTransformSummaryInfo"/>.
+    /// </summary>
+    [Flags]
+    public enum TransformValidations : int
+    {
+        /// <summary>Validate no properties.</summary>
+        None                       = 0x0000,
+
+        /// <summary>Default language must match base database.</summary>
+        Language                   = 0x0001,
+
+        /// <summary>Product must match base database.</summary>
+        Product                    = 0x0002,
+
+        /// <summary>Check major version only.</summary>
+        MajorVersion               = 0x0008,
+
+        /// <summary>Check major and minor versions only.</summary>
+        MinorVersion               = 0x0010,
+
+        /// <summary>Check major, minor, and update versions.</summary>
+        UpdateVersion              = 0x0020,
+
+        /// <summary>Installed version &lt; base version.</summary>
+        NewLessBaseVersion         = 0x0040,
+
+        /// <summary>Installed version &lt;= base version.</summary>
+        NewLessEqualBaseVersion    = 0x0080,
+
+        /// <summary>Installed version = base version.</summary>
+        NewEqualBaseVersion        = 0x0100,
+
+        /// <summary>Installed version &gt;= base version.</summary>
+        NewGreaterEqualBaseVersion = 0x0200,
+
+        /// <summary>Installed version &gt; base version.</summary>
+        NewGreaterBaseVersion      = 0x0400,
+
+        /// <summary>UpgradeCode must match base database.</summary>
+        UpgradeCode                = 0x0800,
+    }
+
+    /// <summary>
+    /// Specifies the installation context for <see cref="ProductInstallation"/>s,
+    /// <see cref="PatchInstallation"/>es, and
+    /// <see cref="Installer.DetermineApplicablePatches(string,string[],InapplicablePatchHandler,string,UserContexts)"/>
+    /// </summary>
+    [Flags]
+    public enum UserContexts : int
+    {
+        /// <summary>Not installed.</summary>
+        None           = 0,
+
+        /// <summary>User managed install context.</summary>
+        UserManaged    = 1,
+
+        /// <summary>User non-managed context.</summary>
+        UserUnmanaged  = 2,
+
+        /// <summary>Per-machine context.</summary>
+        Machine        = 4,
+
+        /// <summary>All contexts, or all valid values.</summary>
+        All            = (UserManaged | UserUnmanaged | Machine),
+
+        /// <summary>All user-managed contexts.</summary>
+        AllUserManaged = 8,
+    }
+
+    /// <summary>
+    /// Defines the type of error encountered by the <see cref="View.Validate"/>, <see cref="View.ValidateNew"/>,
+    /// or <see cref="View.ValidateFields"/> methods of the <see cref="View"/> class.
+    /// </summary>
+    public enum ValidationError : int
+    {
+        /*
+        InvalidArg        = -3,
+        MoreData          = -2,
+        FunctionError     = -1,
+        */
+
+        /// <summary>No error.</summary>
+        None              = 0,
+
+        /// <summary>The new record duplicates primary keys of the existing record in a table.</summary>
+        DuplicateKey      = 1,
+
+        /// <summary>There are no null values allowed, or the column is about to be deleted but is referenced by another row.</summary>
+        Required          = 2,
+
+        /// <summary>The corresponding record in a foreign table was not found.</summary>
+        BadLink           = 3,
+
+        /// <summary>The data is greater than the maximum value allowed.</summary>
+        Overflow          = 4,
+
+        /// <summary>The data is less than the minimum value allowed.</summary>
+        Underflow         = 5,
+
+        /// <summary>The data is not a member of the values permitted in the set.</summary>
+        NotInSet          = 6,
+
+        /// <summary>An invalid version string was supplied.</summary>
+        BadVersion        = 7,
+
+        /// <summary>The case was invalid. The case must be all uppercase or all lowercase.</summary>
+        BadCase           = 8,
+
+        /// <summary>An invalid GUID was supplied.</summary>
+        BadGuid           = 9,
+
+        /// <summary>An invalid wildcard file name was supplied, or the use of wildcards was invalid.</summary>
+        BadWildcard       = 10,
+
+        /// <summary>An invalid identifier was supplied.</summary>
+        BadIdentifier     = 11,
+
+        /// <summary>Invalid language IDs were supplied.</summary>
+        BadLanguage       = 12,
+
+        /// <summary>An invalid file name was supplied.</summary>
+        BadFileName       = 13,
+
+        /// <summary>An invalid path was supplied.</summary>
+        BadPath           = 14,
+
+        /// <summary>An invalid conditional statement was supplied.</summary>
+        BadCondition      = 15,
+
+        /// <summary>An invalid format string was supplied.</summary>
+        BadFormatted      = 16,
+
+        /// <summary>An invalid template string was supplied.</summary>
+        BadTemplate       = 17,
+
+        /// <summary>An invalid string was supplied in the DefaultDir column of the Directory table.</summary>
+        BadDefaultDir     = 18,
+
+        /// <summary>An invalid registry path string was supplied.</summary>
+        BadRegPath        = 19,
+
+        /// <summary>An invalid string was supplied in the CustomSource column of the CustomAction table.</summary>
+        BadCustomSource   = 20,
+
+        /// <summary>An invalid property string was supplied.</summary>
+        BadProperty       = 21,
+
+        /// <summary>The _Validation table is missing a reference to a column.</summary>
+        MissingData       = 22,
+
+        /// <summary>The category column of the _Validation table for the column is invalid.</summary>
+        BadCategory       = 23,
+
+        /// <summary>The table in the Keytable column of the _Validation table was not found or loaded.</summary>
+        BadKeyTable       = 24,
+
+        /// <summary>The value in the MaxValue column of the _Validation table is less than the value in the MinValue column.</summary>
+        BadMaxMinValues   = 25,
+
+        /// <summary>An invalid cabinet name was supplied.</summary>
+        BadCabinet        = 26,
+
+        /// <summary>An invalid shortcut target name was supplied.</summary>
+        BadShortcut       = 27,
+
+        /// <summary>The string is too long for the length specified by the column definition.</summary>
+        StringOverflow    = 28,
+
+        /// <summary>An invalid localization attribute was supplied. (Primary keys cannot be localized.)</summary>
+        BadLocalizeAttrib = 29
+    }
+
+    /// <summary>
+    /// Specifies the modify mode for <see cref="View.Modify"/>.
+    /// </summary>
+    public enum ViewModifyMode : int
+    {
+        /// <summary>
+        /// Refreshes the information in the supplied record without changing the position
+        /// in the result set and without affecting subsequent fetch operations.
+        /// </summary>
+        Seek             = -1,
+
+        /// <summary>Refreshes the data in a Record.</summary>
+        Refresh          = 0,
+
+        /// <summary>Inserts a Record into the view.</summary>
+        Insert           = 1,
+
+        /// <summary>Updates the View with new data from the Record.</summary>
+        Update           = 2,
+
+        /// <summary>Updates or inserts a Record into the View.</summary>
+        Assign           = 3,
+
+        /// <summary>Updates or deletes and inserts a Record into the View.</summary>
+        Replace          = 4,
+
+        /// <summary>Inserts or validates a record.</summary>
+        Merge            = 5,
+
+        /// <summary>Deletes a Record from the View.</summary>
+        Delete           = 6,
+
+        /// <summary>Inserts a Record into the View.  The inserted data is not persistent.</summary>
+        InsertTemporary  = 7,
+
+        /// <summary>Validates a record.</summary>
+        Validate         = 8,
+
+        /// <summary>Validates a new record.</summary>
+        [SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix")]
+        ValidateNew      = 9,
+
+        /// <summary>Validates fields of a fetched or new record. Can validate one or more fields of an incomplete record.</summary>
+        ValidateField    = 10,
+
+        /// <summary>Validates a record that will be deleted later.</summary>
+        ValidateDelete   = 11,
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Errors.resources b/src/dtf/WixToolset.Dtf.WindowsInstaller/Errors.resources
new file mode 100644
index 00000000..5564e88a
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Errors.resources
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Errors.txt b/src/dtf/WixToolset.Dtf.WindowsInstaller/Errors.txt
new file mode 100644
index 00000000..ec7c97b1
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Errors.txt
@@ -0,0 +1,404 @@
+; Windows Installer Internal Error Messages
+;
+; Error numbers greater than 2000 are "internal errors" and do not have
+; localized strings in msimsg.dll.  The messages are provided here
+; (in English only) because they can be informative and time-saving
+; during developement.
+;
+
+2101=Shortcuts not supported by the OS.
+2102=Invalid .INI action: [2]
+2103=Could not resolve path for shell folder [2].
+2104=Writing .INI file: [3]: System error: [2]
+2105=Shortcut Creation [3] Failed. System error: [2]
+2106=Shortcut Deletion [3] Failed. System error: [2]
+2107=Error [3] registering type library [2].
+2108=Error [3] unregistering type library [2].
+2109=Section missing for INI action.
+2110=Key missing for INI action.
+2111=Detection of running apps failed, could not get performance data. Reg operation returned : [2].
+2112=Detection of running apps failed, could not get performance index. Reg operation returned : [2].
+2113=Detection of running apps failed.
+2200=Database: [2]. Database object creation failed, mode = [3].
+2201=Database: [2]. Initialization failed, out of memory.
+2202=Database: [2]. Data access failed, out of memory.
+2203=Database: [2]. Cannot open database file. System error [3].
+2204=Database: [2]. Table already exists: [3]
+2205=Database: [2]. Table does not exist: [3]
+2206=Database: [2]. Table could not be dropped: [3]
+2207=Database: [2]. Intent violation.
+2208=Database: [2]. Insufficient parameters for Execute.
+2209=Database: [2]. Cursor in invalid state.
+2210=Database: [2]. Invalid update data type in column [3]
+2211=Database: [2]. Could not create database table [3]
+2212=Database: [2]. Database not in writable state.
+2213=Database: [2]. Error saving database tables.
+2214=Database: [2]. Error writing export file: [3]
+2215=Database: [2]. Cannot open import file: [3]
+2216=Database: [2]. Import file format error: [3], Line [4]
+2217=Database: [2]. Wrong state to CreateOutputDatabase [3].
+2218=Database: [2]. Table name not supplied.
+2219=Database: [2]. Invalid Installer database format.
+2220=Database: [2]. Invalid row/field data.
+2221=Database: [2]. Code page conflict in import file: [3].
+2222=Database: [2]. Transform or merge code page [3] differs from database code page [4].
+2223=Database: [2]. Databases are the same. No transform generated.
+2224=Database: [2]. GenerateTransform: Database corrupt. Table: [3]
+2225=Database: [2]. Transform: Cannot transform a temporary table. Table: [3]
+2226=Database: [2]. Transform failed.
+2227=Database: [2]. Invalid identifier '[3]' in SQL query: [4]
+2228=Database: [2]. Unknown table '[3]' in SQL query: [4]
+2229=Database: [2]. Could not load table '[3]' in SQL query: [4]
+2230=Database: [2]. Repeated table '[3]' in SQL query: [4]
+2231=Database: [2]. Missing ')' in SQL query: [3]
+2232=Database: [2]. Unexpected token '[3]' in SQL query: [4]
+2233=Database: [2]. No columns in SELECT clause in SQL query: [3]
+2234=Database: [2]. No columns in ORDER BY clause in SQL query: [3]
+2235=Database: [2]. Column '[3]' not present or ambiguous in SQL query: [4]
+2236=Database: [2]. Invalid operator '[3]' in SQL query: [4]
+2237=Database: [2]. Invalid or missing query string: [3]
+2238=Database: [2]. Missing FROM clause in SQL query: [3]
+2239=Database: [2]. Insufficient values in INSERT SQL stmt.
+2240=Database: [2]. Missing update columns in UPDATE SQL stmt.
+2241=Database: [2]. Missing insert columns in INSERT SQL stmt.
+2242=Database: [2]. Column '[3]' repeated
+2243=Database: [2]. No primary columns defined for table creation.
+2244=Database: [2]. Invalid type specifier '[3]' in SQL query [4].
+2245=IStorage::Stat failed with error [3]
+2246=Database: [2]. Invalid Installer transform format.
+2247=Database: [2] Transform stream read/write failure.
+2248=Database: [2] GenerateTransform/Merge: Column type in base table doesn't match reference table. Table: [3] Col #: [4]
+2249=Database: [2] GenerateTransform: More columns in base table than in reference table. Table: [3]
+2250=Database: [2] Transform: Cannot add existing row. Table: [3]
+2251=Database: [2] Transform: Cannot delete row that doesn't exist. Table: [3]
+2252=Database: [2] Transform: Cannot add existing table. Table: [3]
+2253=Database: [2] Transform: Cannot delete table that doesn't exist. Table: [3]
+2254=Database: [2] Transform: Cannot update row that doesn't exist. Table: [3]
+2255=Database: [2] Transform: Column with this name already exists. Table: [3] Col: [4]
+2256=Database: [2] GenerateTransform/Merge: Number of primary keys in base table doesn't match reference table. Table: [3]
+2257=Database: [2]. Intent to modify read only table: [3]
+2258=Database: [2]. Type mismatch in parameter: [3]
+2259=Database: [2] Table(s) Update failed.
+2260=Storage CopyTo failed. System error: [3]
+2261=Could not remove stream [2]. System error: [3]
+2262=Stream does not exist: [2]. System error: [3]
+2263=Could not open stream [2]. System error: [3]
+2264=Could not remove stream [2]. System error: [3]
+2265=Could not commit storage. System error: [3]
+2266=Could not rollback storage. System error: [3]
+2267=Could not delete storage [2]. System error: [3]
+2268=Database: [2]. Merge: There were merge conflicts reported in [3] tables.
+2269=Database: [2]. Merge: The column count differed in the '[3]' table of the two databases.
+2270=Database: [2]. GenerateTransform/Merge: Column name in base table doesn't match reference table. Table: [3] Col #: [4]
+2271=SummaryInformation write for transform failed.
+2272=Database: [2]. MergeDatabase will not write any changes because the database is open read-only.
+2273=Database: [2]. MergeDatabase: A reference to the base database was passed as the reference database.
+2274=Database: [2]. MergeDatabase: Unable to write errors to Error table. Could be due to a non-nullable column in a predefined Error table.
+2275=Database: [2]. Specified Modify [3] operation invalid for table joins.
+2276=Database: [2]. Code page [3] not supported by the system.
+2277=Database: [2]. Failed to save table [3].
+2278=Database: [2]. Exceeded number of expressions limit of 32 in WHERE clause of SQL query: [3].
+2279=Database: [2] Transform: Too many columns in base table [3]
+2280=Database: [2]. Could not create column [3] for table [4]
+2281=Could not rename stream [2]. System error: [3]
+2282=Stream name invalid [2].
+2302=Patch notify: [2] bytes patched to far.
+2303=Error getting volume info. GetLastError: [2]
+2304=Error getting disk free space. GetLastError: [2]. Volume: [3]
+2305=Error waiting for patch thread. GetLastError: [2].
+2306=Could not create thread for patch application. GetLastError: [2].
+2307=Source file key name is null.
+2308=Destination File Name is Null
+2309=Attempting to patch file [2] when patch already in progress.
+2310=Attempting to continue patch when no patch is in progress.
+2315=Missing Path Separator: [2]
+2318=File does not exist: [2]
+2319=Error setting file attribute: [3] GetLastError: [2]
+2320=File not writable: [2]
+2321=Error creating file: [2]
+2322=User canceled
+2323=Invalid File Attribute
+2324=Could not open file: [3] GetLastError: [2]
+2325=Could not get file time for file: [3] GetLastError: [2]
+2326=Error in FileToDosDateTime.
+2327=Could not remove directory: [3] GetLastError: [2]
+2328=Error getting file version info for file: [2]
+2329=Error deleting file: [3]. GetLastError: [2]
+2330=Error getting file attributes: [3]. GetLastError: [2]
+2331=Error loading library [2] or finding entry point [3]
+2332=Error getting file attributes. GetLastError: [2]
+2333=Error setting file attributes. GetLastError: [2]
+2334=Error converting file time to local time for file: [3]. GetLastError: [2]
+2335=Path: [2] is not a parent of [3]
+2336=Error creating temp file on path: [3]. GetLastError: [2]
+2337=Could not close file: [3] GetLastError: [2]
+2338=Could not update resource for file: [3] GetLastError: [2]
+2339=Could not set file time for file: [3] GetLastError: [2]
+2340=Could not update resource for file: [3], Missing Resource
+2341=Could not update resource for file: [3], Resource too large
+2342=Could not update resource for file: [3] GetLastError: [2]
+2343=Specified path is empty.
+2344=Could not find required file IMAGEHLP.DLL to validate file:[2]
+2345=[2]: File does not contain a valid checksum value.
+2347=User ignore
+2348=Error attempting to read from cabinet stream.
+2349=Copy Resumed With Different Info
+2350=FDI Server Error
+2351=File key '[2]' not found in cabinet '[3]'. The installation cannot continue.
+2352=Couldn't initialize cabinet file server. The required file 'Cabinet.dll' may be missing.
+2353=Not a cabinet
+2354=Cannot handle cabinet
+2355=Corrupt cabinet
+2356=Couldn't locate cabinet in stream: [2].
+2357=Cannot set attributes
+2358=Error determining whether file is in-use: [3]. GetLastError: [2]
+2359=Unable to create the target file - file may be in use.
+2360=progress tick.
+2361=Need next cabinet.
+2362=Folder not found: [2]
+2363=Could not enumerate subfolders for folder: [2]
+2364=Bad enumeration constant in CreateCopier call.
+2365=Could not BindImage exe file [2]
+2366=User Failure
+2367=User Abort.
+2368=Failed to get network resource information. Error [2], network path [3]. Extended error: network provider [5], error code [4], error description [6].
+2370=Invalid CRC checksum value for [2] file.{ Its header says [3] for checksum, its computed value is [4].}
+2371=Could not apply patch to file [2]. GetLastError: [3]
+2372=Patch file [2] is corrupt or of an invalid format. Attempting to patch file [3]. GetLastError: [4]
+2373=File [2] is not a valid patch file.
+2374=File [2] is not a valid destination file for patch file [3].
+2375=Unknown patching error: [2].
+2376=Cabinet not found.
+2379=Error opening file for read: [3] GetLastError: [2]
+2380=Error opening file for write: [3] GetLastError: [2]
+2381=Directory does not exist: [2]
+2382=Drive not ready: [2]
+2401=64-bit registry operation attempted on 32-bit operating system for key [2].
+2402=Out of memory.
+2501=Could not create rollback script enumerator
+2502=Called InstallFinalize when no install in progress.
+2503=Called RunScript when not marked in progress.
+2601=Invalid value for property [2]: '[3]'
+2602=The [2] table entry '[3]' has no associated entry in the Media table.
+2603=Duplicate Table Name [2]
+2604=[2] property undefined.
+2605=Could not find server [2] in [3] or [4].
+2606=Value of property [2] is not a valid full path: '[3]'.
+2607=Media table not found or empty (required for installation of files).
+2608=Could not create security descriptor for object. Error: '[2]'.
+2609=Attempt to migrate product settings before initialization.
+2611=The file [2] is marked as compressed, but the associated media entry does not specify a cabinet.
+2612=Stream not found in '[2]' column. Primary key: '[3]'.
+2613=RemoveExistingProducts action sequenced incorrectly.
+2614=Could not access IStorage object from installation package.
+2615=Skipped unregistration of Module [2] due to source resolution failure.
+2616=Companion file [2] parent missing.
+2617=Shared component [2] not found in Component table.
+2618=Isolated application component [2] not found in Component table.
+2619=Isolated components [2], [3] not part of same feature.
+2620=Key file of isolated application component [2] not in File table.
+2621=Resource DLL or Resource ID information for shortcut [2] set incorrectly.
+2701=The Component Table exceeds the acceptable tree depth of [2] levels.
+2702=A Feature Table record ([2]) references a non-existent parent in the Attributes field.
+2703=Property name for root source path not defined: [2]
+2704=Root directory property undefined: [2]
+2705=Invalid table: [2]; Could not be linked as tree.
+2706=Source paths not created. No path exists for entry [2] in Directory Table
+2707=Target paths not created. No path exists for entry [2] in Directory Table
+2708=No entries found in the file table.
+2709=The specified Component name ('[2]') not found in Component Table.
+2710=The requested 'Select' state is illegal for this Component.
+2711=The specified Feature name ('[2]') not found in Feature Table.
+2712=Invalid return from modeless dialog: [3], in action [2].
+2713=Null value in a non-nullable column ('[2]' in '[3]' column of the '[4]' table.
+2714=Invalid value for default folder name: [2].
+2715=The specified File key ('[2]') not found in the File Table.
+2716=Couldn't create a random subcomponent name for component '[2]'.
+2717=Bad action condition or error calling custom action '[2]'.
+2718=Missing package name for product code '[2]'.
+2719=Neither UNC nor drive letter path found in source '[2]'.
+2720=Error opening source list key. Error: '[2]'
+2721=Custom action [2] not found in Binary table stream
+2722=Custom action [2] not found in File table
+2723=Custom action [2] specifies unsupported type
+2724=The volume label '[2]' on the media you're running from doesn't match the label '[3]' given in the Media table. This is allowed only if you have only 1 entry in your Media table.
+2725=Invalid database tables
+2726=Action not found: [2]
+2727=The directory entry '[2]' does not exist in the Directory table
+2728=Table definition error: [2]
+2729=Install engine not initialized.
+2730=Bad value in database. Table: '[2]'; Primary key: '[3]'; Column: '[4]'
+2731=Selection Manager not initialized.
+2732=Directory Manager not initialized.
+2733=Bad foreign key ('[2]') in '[3]' column of the '[4]' table.
+2734=Invalid Reinstall mode character.
+2735=Custom action '[2]' has caused an unhandled exception and has been stopped. This may be the result of an internal error in the custom action, such as an access violation.
+2736=Generation of custom action temp file failed: [2]
+2737=Could not access custom action [2], entry [3], library [4]
+2738=Could not access VBScript runtime for custom action [2]
+2739=Could not access JavaScript runtime for custom action [2]
+2740=Custom action [2] script error [3], [4]: [5] Line [6], Column [7], [8]
+2741=Configuration information for product [2] is corrupt. Invalid info: [2]
+2742=Marshaling to Server failed: [2]
+2743=Could not execute custom action [2], location: [3], command: [4]
+2744=EXE failed called by custom action [2], location: [3], command: [4]
+2745=Transform [2] invalid for package [3]. Expected language [4], found language [5].
+2746=Transform [2] invalid for package [3]. Expected product [4], found product [5].
+2747=Transform [2] invalid for package [3]. Expected product version < [4], found product version [5].
+2748=Transform [2] invalid for package [3]. Expected product version <= [4], found product version [5].
+2749=Transform [2] invalid for package [3]. Expected product version == [4], found product version [5].
+2750=Transform [2] invalid for package [3]. Expected product version >= [4], found product version [5].
+2751=Transform [2] invalid for package [3]. Expected product version > [4], found product version [5].
+2752=Could not open transform [2] stored as child storage of package [4].
+2753=The File '[2]' is not marked for installation.
+2754=The File '[2]' is not a valid patch file.
+2755=Server returned unexpected error [2] attempting to install package [3].
+2756=The property '[2]' was used as a directory property in one or more tables, but no value was ever assigned.
+2757=Could not create summary info for transform [2].
+2758=Transform [2] doesn't contain a MSI version.
+2759=Transform [2] version [3] incompatible with engine; Min: [4], Max: [5].
+2760=Transform [2] invalid for package [3]. Expected upgrade code [4], found [5].
+2761=Cannot begin transaction. Global mutex not properly initialized.
+2762=Cannot write script record. Transaction not started.
+2763=Cannot run script. Transaction not started.
+2765=Assembly name missing from AssemblyName table : Component: [4].
+2766=The file [2] is an invalid MSI storage file.
+2767=No more data{ while enumerating [2]}.
+2768=Transform in patch package is invalid.
+2769=Custom Action [2] did not close [3] handles.
+2770=Cached folder [2] not defined in internal cache folder table.
+2771=Upgrade of feature [2] has a missing component.
+2772=New upgrade feature [2] must be a leaf feature.
+2801=Unknown Message -- Type [2]. No action is taken.
+2802=No publisher is found for the event [2].
+2803=Dialog View did not find a record for the dialog [2].
+2804=On activation of the control [3] on dialog [2], failed to evaluate the condition [3].
+2805=
+2806=The dialog [2] failed to evaluate the condition [3].
+2807=The action [2] is not recognized.
+2808=Default button is ill-defined on dialog [2].
+2809=On the dialog [2] the next control pointers do not form a cycle. There is a pointer from [3] to [4], but there is no further pointer.
+2810=On the dialog [2] the next control pointers do not form a cycle. There is a pointer from both [3] and [5] to [4].
+2811=On dialog [2] control [3] has to take focus, but it is unable to do so.
+2812=The event [2] is not recognized.
+2813=The EndDialog event was called with the argument [2], but the dialog has a parent.
+2814=On the dialog [2] the control [3] names a non-existent control [4] as the next control.
+2815=ControlCondition table has a row without condition for the dialog [2].
+2816=The EventMapping table refers to an invalid control [4] on dialog [2] for the event [3].
+2817=The event [2] failed to set the attribute for the control [4] on dialog [3].
+2818=In the ControlEvent table EndDialog has an unrecognized argument [2].
+2819=Control [3] on dialog [2] needs a property linked to it.
+2820=Attempted to initialize an already initialized handler.
+2821=Attempted to initialize an already initialized dialog: [2].
+2822=No other method can be called on dialog [2] until all the controls are added.
+2823=Attempted to initialize an already initialized control: [3] on dialog [2].
+2824=The dialog attribute [3] needs a record of at least [2] field(s).
+2825=The control attribute [3] needs a record of at least [2] field(s).
+2826=Control [3] on dialog [2] extends beyond the boundaries of the dialog [4] by [5] pixels.
+2827=The button [4] on the radio button group [3] on dialog [2] extends beyond the boundaries of the group [5] by [6] pixels.
+2828=Tried to remove control [3] from dialog [2], but the control is not part of the dialog.
+2829=Attempt to use an uninitialized dialog.
+2830=Attempt to use an uninitialized control on dialog [2].
+2831=The control [3] on dialog [2] does not support [5] the attribute [4].
+2832=The dialog [2] does not support the attribute [3].
+2833=Control [4] on dialog [3] ignored the message [2].
+2834=The next pointers on the dialog [2] do not form a single loop.
+2835=The control [2] was not found on dialog [3].
+2836=The control [3] on the dialog [2] cannot take focus.
+2837=The control [3] on dialog [2] wants the win proc to return [4].
+2838=The item [2] in the selection table has itself as a parent.
+2839=Setting the property [2] failed.
+2840=Error dialog name mismatch.
+2841=No OK button was found on the error dialog
+2842=No text field was found on the error dialog.
+2843=The ErrorString attribute is not supported for standard dialogs.
+2844=Cannot execute an error dialog if the error string is not set.
+2845=The total width of the buttons exceeds the size of the error dialog.
+2846=SetFocus did not find the required control on the error dialog.
+2847=The control [3] on dialog [2] has both the icon and the bitmap style set.
+2848=Tried to set control [3] as the default button on dialog [2], but the control does not exist.
+2849=The control [3] on dialog [2] is of a type, that cannot be integer valued.
+2850=Unrecognized volume type.
+2851=The data for the icon [2] is not valid.
+2852=At least one control has to be added to dialog [2] before it is used.
+2853=Dialog [2] is a modeless dialog. The execute method should not be called on it.
+2854=On the dialog [2] the control [3] is designated as first active control, but there is no such control.
+2855=The radio button group [3] on dialog [2] has fewer than 2 buttons.
+2856=Creating a second copy of the dialog [2].
+2857=The directory [2] is mentioned in the selection table but not found.
+2858=The data for the bitmap [2] is not valid.
+2859=Test error message.
+2860=Cancel button is ill-defined on dialog [2].
+2861=The next pointers for the radio buttons on dialog [2] control [3] do not form a cycle.
+2862=The attributes for the control [3] on dialog [2] do not define a valid icon size. Setting the size to 16.
+2863=The control [3] on dialog [2] needs the icon [4] in size [5]x[5], but that size is not available. Loading the first available size.
+2864=The control [3] on dialog [2] received a browse event, but there is no configurable directory for the present selection. Likely cause: browse button is not authored correctly.
+2865=Control [3] on billboard [2] extends beyond the boundaries of the billboard [4] by [5] pixels.
+2866=The dialog [2] is not allowed to return the argument [3].
+2867=The error dialog property is not set.
+2868=The error dialog [2] does not have the error style bit set.
+2869=The dialog [2] has the error style bit set, but is not an error dialog.
+2870=The help string [4] for control [3] on dialog [2] does not contain the separator character.
+2871=The [2] table is out of date: [3]
+2872=The argument of the CheckPath control event on dialog [2] is invalid.
+2873=On the dialog [2] the control [3] has an invalid string length limit: [4]
+2874=Changing the text font to [2] failed.
+2875=Changing the text color to [2] failed.
+2876=The control [3] on dialog [2] had to truncate the string: [4]
+2877=The binary data [2] was not found.
+2878=On the dialog [2] the control [3] has a possible value: [4]. This is an invalid or duplicate value.
+2879=The control [3] on dialog [2] cannot parse the mask string: [4]
+2880=Do not perform the remaining control events.
+2881=Initialization failed.
+2882=Dialog window class registration failed.
+2883=CreateNewDialog failed for the dialog [2].
+2884=Failed to create a window for the dialog [2]!
+2885=Failed to create the control [3] on the dialog [2].
+2886=Creating the [2] table failed.
+2887=Creating a cursor to the [2] table failed.
+2888=Executing the [2] view failed.
+2889=Creating the window for the control [3] on dialog [2] failed.
+2890=The handler failed in creating an initialized dialog.
+2891=Failed to destroy window for dialog [2].
+2892=[2] is an integer only control, [3] is not a valid integer value.
+2893=The control [3] on dialog [2] can accept property values that are at most [5] characters long. The value [4] exceeds this limit, and has been truncated.
+2894=Loading RichEd20.dll failed. GetLastError() returned: [2]
+2895=Freeing RichEd20.dll failed. GetLastError() returned: [2]
+2896=Executing action [2] failed.
+2897=Failed to create any [2] font on this system.
+2898=For [2] text style, the system created a '[3]' font, in [4] character set.
+2899=Failed to create [2] text style. GetLastError() returned: [3].
+2901=Invalid parameter to operation [2]: Parameter [3]
+2902=Operation [2] called out of sequence.
+2903=The file [2] is missing.
+2904=Could not BindImage file [2].
+2905=Could not read record from script file [2].
+2906=Missing header in script file [2].
+2907=Could not create secure security descriptor. Error: [2]
+2908=Could not register component [2].
+2909=Could not unregister component [2].
+2910=Could not determine user's security id.
+2911=Could not remove the folder [2].
+2912=Could not schedule file [2] for removal on reboot.
+2919=No cabinet specified for compressed file: [2]
+2920=Source directory not specified for file [2].
+2924=Script [2] version unsupported. Script version: [3], minimum version: [4], maximum version: [5].
+2927=ShellFolder id [2] is invalid.
+2928=Exceeded maximum number of sources. Skipping source '[2]'.
+2929=Could not determine publishing root. Error: [2]
+2932=Could not create file [2] from script data. Error: [3]
+2933=Could not initialize rollback script [2].
+2934=Could not secure transform [2]. Error [3]
+2935=Could not un-secure transform [2]. Error [3]
+2936=Could not find transform [2].
+2937=The Windows Installer cannot install a system file protection catalog. Catalog: [2], Error: [3]
+2938=The Windows Installer cannot retrieve a system file protection catalog from the cache. Catalog: [2], Error: [3]
+2939=The Windows Installer cannot delete a system file protection catalog from the cache. Catalog: [2], Error: [3]
+2940=Directory Manager not supplied for source resolution.
+2941=Unable to compute the CRC for file [2].
+2942=BindImage action has not been executed on [2] file.
+2943=This version of Windows does not support deploying 64-bit packages. The script [2] is for a 64-bit package.
+2944=GetProductAssignmentType failed.
+2945=Installation of ComPlus App [2] failed with error [3].
+3001=The patches in this list contain incorrect sequencing information: [2][3][4][5][6][7][8][9][10][11][12][13][14][15][16]. 3.0  
+3002=Patch [2] contains invalid sequencing information.
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Exceptions.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/Exceptions.cs
new file mode 100644
index 00000000..4954cda0
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Exceptions.cs
@@ -0,0 +1,573 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Runtime.Serialization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Base class for Windows Installer exceptions.
+    /// </summary>
+    [Serializable]
+    public class InstallerException : SystemException
+    {
+        private int errorCode;
+        private object[] errorData;
+
+        /// <summary>
+        /// Creates a new InstallerException with a specified error message and a reference to the
+        /// inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="msg">The message that describes the error.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception. If the
+        /// innerException parameter is not a null reference (Nothing in Visual Basic), the current exception
+        /// is raised in a catch block that handles the inner exception.</param>
+        public InstallerException(string msg, Exception innerException)
+            : this(0, msg, innerException)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new InstallerException with a specified error message.
+        /// </summary>
+        /// <param name="msg">The message that describes the error.</param>
+        public InstallerException(string msg)
+            : this(0, msg)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new InstallerException.
+        /// </summary>
+        public InstallerException()
+            : this(0, null)
+        {
+        }
+
+        internal InstallerException(int errorCode, string msg, Exception innerException)
+            : base(msg, innerException)
+        {
+            this.errorCode = errorCode;
+            this.SaveErrorRecord();
+        }
+
+        internal InstallerException(int errorCode, string msg)
+            : this(errorCode, msg, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the InstallerException class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected InstallerException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+
+            this.errorCode = info.GetInt32("msiErrorCode");
+        }
+
+        /// <summary>
+        /// Gets the system error code that resulted in this exception, or 0 if not applicable.
+        /// </summary>
+        public int ErrorCode
+        {
+            get
+            {
+                return this.errorCode;
+            }
+        }
+
+        /// <summary>
+        /// Gets a message that describes the exception.  This message may contain detailed
+        /// formatted error data if it was available.
+        /// </summary>
+        public override String Message
+        {
+            get
+            {
+                string msg = base.Message;
+                using (Record errorRec = this.GetErrorRecord())
+                {
+                    if (errorRec != null)
+                    {
+                        string errorMsg = Installer.GetErrorMessage(errorRec, CultureInfo.InvariantCulture);
+                        msg = Combine(msg, errorMsg);
+                    }
+                }
+                return msg;
+            }
+        }
+
+        /// <summary>
+        /// Sets the SerializationInfo with information about the exception.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+
+            info.AddValue("msiErrorCode", this.errorCode);
+            base.GetObjectData(info, context);
+        }
+
+        /// <summary>
+        /// Gets extended information about the error, or null if no further information
+        /// is available.
+        /// </summary>
+        /// <returns>A Record object. Field 1 of the Record contains the installer
+        /// message code. Other fields contain data specific to the particular error.</returns>
+        /// <remarks><p>
+        /// If the record is passed to <see cref="Session.Message"/>, it is formatted
+        /// by looking up the string in the current database. If there is no installation
+        /// session, the formatted error message may be obtained by a query on the Error table using
+        /// the error code, followed by a call to <see cref="Record.ToString()"/>.
+        /// Alternatively, the standard MSI message can by retrieved by calling the
+        /// <see cref="Installer.GetErrorMessage(Record,CultureInfo)"/> method.
+        /// </p><p>
+        /// The following methods and properties may report extended error data:
+        /// <list type="bullet">
+        /// <item><see cref="Database"/> (constructor)</item>
+        /// <item><see cref="Database"/>.<see cref="Database.ApplyTransform(string,TransformErrors)"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.Commit"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.Execute(string,object[])"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.ExecuteQuery(string,object[])"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.ExecuteIntegerQuery(string,object[])"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.ExecuteStringQuery(string,object[])"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.Export"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.ExportAll"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.GenerateTransform"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.Import"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.ImportAll"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.Merge(Database,string)"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.OpenView"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.SummaryInfo"/></item>
+        /// <item><see cref="Database"/>.<see cref="Database.ViewTransform"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Assign"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Delete"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Execute(Record)"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Insert"/></item>
+        /// <item><see cref="View"/>.<see cref="View.InsertTemporary"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Merge"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Modify"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Refresh"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Replace"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Seek"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Update"/></item>
+        /// <item><see cref="View"/>.<see cref="View.Validate"/></item>
+        /// <item><see cref="View"/>.<see cref="View.ValidateFields"/></item>
+        /// <item><see cref="View"/>.<see cref="View.ValidateDelete"/></item>
+        /// <item><see cref="View"/>.<see cref="View.ValidateNew"/></item>
+        /// <item><see cref="SummaryInfo"/> (constructor)</item>
+        /// <item><see cref="Record"/>.<see cref="Record.SetStream(int,string)"/></item>
+        /// <item><see cref="Session"/>.<see cref="Session.SetInstallLevel"/></item>
+        /// <item><see cref="Session"/>.<see cref="Session.GetSourcePath"/></item>
+        /// <item><see cref="Session"/>.<see cref="Session.GetTargetPath"/></item>
+        /// <item><see cref="Session"/>.<see cref="Session.SetTargetPath"/></item>
+        /// <item><see cref="ComponentInfo"/>.<see cref="ComponentInfo.CurrentState"/></item>
+        /// <item><see cref="FeatureInfo"/>.<see cref="FeatureInfo.CurrentState"/></item>
+        /// <item><see cref="FeatureInfo"/>.<see cref="FeatureInfo.ValidStates"/></item>
+        /// <item><see cref="FeatureInfo"/>.<see cref="FeatureInfo.GetCost"/></item>
+        /// </list>
+        /// </p><p>
+        /// The Record object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// It is best that the handle be closed manually as soon as it is no longer
+        /// needed, as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetlasterrorrecord.asp">MsiGetLastErrorRecord</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
+        public Record GetErrorRecord()
+        {
+            return this.errorData != null ? new Record(this.errorData) : null;
+        }
+
+        internal static Exception ExceptionFromReturnCode(uint errorCode)
+        {
+            return ExceptionFromReturnCode(errorCode, null);
+        }
+
+        internal static Exception ExceptionFromReturnCode(uint errorCode, string msg)
+        {
+            msg = Combine(GetSystemMessage(errorCode), msg);
+            switch (errorCode)
+            {
+                case (uint) NativeMethods.Error.FILE_NOT_FOUND:
+                case (uint) NativeMethods.Error.PATH_NOT_FOUND: return new FileNotFoundException(msg);
+                
+                case (uint) NativeMethods.Error.INVALID_PARAMETER:
+                case (uint) NativeMethods.Error.DIRECTORY:
+                case (uint) NativeMethods.Error.UNKNOWN_PROPERTY:
+                case (uint) NativeMethods.Error.UNKNOWN_PRODUCT:
+                case (uint) NativeMethods.Error.UNKNOWN_FEATURE:
+                case (uint) NativeMethods.Error.UNKNOWN_COMPONENT: return new ArgumentException(msg);
+                
+                case (uint) NativeMethods.Error.BAD_QUERY_SYNTAX: return new BadQuerySyntaxException(msg);
+                
+                case (uint) NativeMethods.Error.INVALID_HANDLE_STATE:
+                case (uint) NativeMethods.Error.INVALID_HANDLE:
+                    InvalidHandleException ihex = new InvalidHandleException(msg);
+                    ihex.errorCode = (int) errorCode;
+                    return ihex;
+                
+                case (uint) NativeMethods.Error.INSTALL_USEREXIT: return new InstallCanceledException(msg);
+                
+                case (uint) NativeMethods.Error.CALL_NOT_IMPLEMENTED: return new NotImplementedException(msg);
+                
+                default: return new InstallerException((int) errorCode, msg);
+            }
+        }
+
+        internal static string GetSystemMessage(uint errorCode)
+        {
+            const uint FORMAT_MESSAGE_IGNORE_INSERTS  = 0x00000200;
+            const uint FORMAT_MESSAGE_FROM_SYSTEM     = 0x00001000;
+
+            StringBuilder buf = new StringBuilder(1024);
+            uint formatCount = NativeMethods.FormatMessage(
+                FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
+                IntPtr.Zero,
+                (uint) errorCode,
+                0,
+                buf,
+                (uint) buf.Capacity,
+                IntPtr.Zero);
+
+            if (formatCount != 0)
+            {
+                return buf.ToString().Trim();
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        internal void SaveErrorRecord()
+        {
+            // TODO: pass an affinity handle here?
+            int recordHandle = RemotableNativeMethods.MsiGetLastErrorRecord(0);
+            if (recordHandle != 0)
+            {
+                using (Record errorRec = new Record((IntPtr) recordHandle, true, null))
+                {
+                    this.errorData = new object[errorRec.FieldCount];
+                    for (int i = 0; i < this.errorData.Length; i++)
+                    {
+                        this.errorData[i] = errorRec[i + 1];
+                    }
+                }
+            }
+            else
+            {
+                this.errorData = null;
+            }
+        }
+
+        private static string Combine(string msg1, string msg2)
+        {
+            if (msg1 == null) return msg2;
+            if (msg2 == null) return msg1;
+            return msg1 + " " + msg2;
+        }
+    }
+
+    /// <summary>
+    /// User Canceled the installation.
+    /// </summary>
+    [Serializable]
+    public class InstallCanceledException : InstallerException
+    {
+        /// <summary>
+        /// Creates a new InstallCanceledException with a specified error message and a reference to the
+        /// inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="msg">The message that describes the error.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception. If the
+        /// innerException parameter is not a null reference (Nothing in Visual Basic), the current exception
+        /// is raised in a catch block that handles the inner exception.</param>
+        public InstallCanceledException(string msg, Exception innerException)
+            : base((int) NativeMethods.Error.INSTALL_USEREXIT, msg, innerException)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new InstallCanceledException with a specified error message.
+        /// </summary>
+        /// <param name="msg">The message that describes the error.</param>
+        public InstallCanceledException(string msg)
+            : this(msg, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new InstallCanceledException.
+        /// </summary>
+        public InstallCanceledException()
+            : this(null, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the InstallCanceledException class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected InstallCanceledException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+
+    /// <summary>
+    /// A bad SQL query string was passed to <see cref="Database.OpenView"/> or <see cref="Database.Execute(string,object[])"/>.
+    /// </summary>
+    [Serializable]
+    public class BadQuerySyntaxException : InstallerException
+    {
+        /// <summary>
+        /// Creates a new BadQuerySyntaxException with a specified error message and a reference to the
+        /// inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="msg">The message that describes the error.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception. If the
+        /// innerException parameter is not a null reference (Nothing in Visual Basic), the current exception
+        /// is raised in a catch block that handles the inner exception.</param>
+        public BadQuerySyntaxException(string msg, Exception innerException)
+            : base((int) NativeMethods.Error.BAD_QUERY_SYNTAX, msg, innerException)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new BadQuerySyntaxException with a specified error message.
+        /// </summary>
+        /// <param name="msg">The message that describes the error.</param>
+        public BadQuerySyntaxException(string msg)
+            : this(msg, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new BadQuerySyntaxException.
+        /// </summary>
+        public BadQuerySyntaxException()
+            : this(null, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the BadQuerySyntaxException class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected BadQuerySyntaxException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+
+    /// <summary>
+    /// A method was called on an invalid installer handle.  The handle may have been already closed.
+    /// </summary>
+    [Serializable]
+    public class InvalidHandleException : InstallerException
+    {
+        /// <summary>
+        /// Creates a new InvalidHandleException with a specified error message and a reference to the
+        /// inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="msg">The message that describes the error.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception. If the
+        /// innerException parameter is not a null reference (Nothing in Visual Basic), the current exception
+        /// is raised in a catch block that handles the inner exception.</param>
+        public InvalidHandleException(string msg, Exception innerException)
+            : base((int) NativeMethods.Error.INVALID_HANDLE, msg, innerException)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new InvalidHandleException with a specified error message.
+        /// </summary>
+        /// <param name="msg">The message that describes the error.</param>
+        public InvalidHandleException(string msg)
+            : this(msg, null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new InvalidHandleException.
+        /// </summary>
+        public InvalidHandleException()
+            : this(null, null)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the InvalidHandleException class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected InvalidHandleException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+    }
+
+    /// <summary>
+    /// A failure occurred when executing <see cref="Database.Merge(Database,string)"/>.  The exception may contain
+    /// details about the merge conflict.
+    /// </summary>
+    [Serializable]
+    public class MergeException : InstallerException
+    {
+        private IList<string> conflictTables;
+        private IList<int> conflictCounts;
+
+        /// <summary>
+        /// Creates a new MergeException with a specified error message and a reference to the
+        /// inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="msg">The message that describes the error.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception. If the
+        /// innerException parameter is not a null reference (Nothing in Visual Basic), the current exception
+        /// is raised in a catch block that handles the inner exception.</param>
+        public MergeException(string msg, Exception innerException)
+            : base(msg, innerException)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new MergeException with a specified error message.
+        /// </summary>
+        /// <param name="msg">The message that describes the error.</param>
+        public MergeException(string msg)
+            : base(msg)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new MergeException.
+        /// </summary>
+        public MergeException()
+            : base()
+        {
+        }
+
+        internal MergeException(Database db, string conflictsTableName)
+            : base("Merge failed.")
+        {
+            if (conflictsTableName != null)
+            {
+                IList<string> conflictTableList = new List<string>();
+                IList<int> conflictCountList = new List<int>();
+
+                using (View view = db.OpenView("SELECT `Table`, `NumRowMergeConflicts` FROM `" + conflictsTableName + "`"))
+                {
+                    view.Execute();
+
+                    foreach (Record rec in view) using (rec)
+                    {
+                        conflictTableList.Add(rec.GetString(1));
+                        conflictCountList.Add((int) rec.GetInteger(2));
+                    }
+                }
+
+                this.conflictTables = conflictTableList;
+                this.conflictCounts = conflictCountList;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the MergeException class with serialized data.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        protected MergeException(SerializationInfo info, StreamingContext context) : base(info, context)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+
+            this.conflictTables = (string[]) info.GetValue("mergeConflictTables", typeof(string[]));
+            this.conflictCounts = (int[]) info.GetValue("mergeConflictCounts", typeof(int[]));
+        }
+
+        /// <summary>
+        /// Gets the number of merge conflicts in each table, corresponding to the tables returned by
+        /// <see cref="ConflictTables"/>.
+        /// </summary>
+        public IList<int> ConflictCounts
+        {
+            get
+            {
+                return new List<int>(this.conflictCounts);
+            }
+        }
+
+        /// <summary>
+        /// Gets the list of tables containing merge conflicts.
+        /// </summary>
+        public IList<string> ConflictTables
+        {
+            get
+            {
+                return new List<string>(this.conflictTables);
+            }
+        }
+
+        /// <summary>
+        /// Gets a message that describes the merge conflits.
+        /// </summary>
+        public override String Message
+        {
+            get
+            {
+                StringBuilder msg = new StringBuilder(base.Message);
+                if (this.conflictTables != null)
+                {
+                    for (int i = 0; i < this.conflictTables.Count; i++)
+                    {
+                        msg.Append(i == 0 ? "  Conflicts: " : ", ");
+                        msg.Append(this.conflictTables[i]);
+                        msg.Append('(');
+                        msg.Append(this.conflictCounts[i]);
+                        msg.Append(')');
+                    }
+                }
+                return msg.ToString();
+            }
+        }
+
+        /// <summary>
+        /// Sets the SerializationInfo with information about the exception.
+        /// </summary>
+        /// <param name="info">The SerializationInfo that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The StreamingContext that contains contextual information about the source or destination.</param>
+        public override void GetObjectData(SerializationInfo info, StreamingContext context)
+        {
+            if (info == null)
+            {
+                throw new ArgumentNullException("info");
+            }
+
+            info.AddValue("mergeConflictTables", this.conflictTables);
+            info.AddValue("mergeConflictCounts", this.conflictCounts);
+            base.GetObjectData(info, context);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/ExternalUIHandler.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/ExternalUIHandler.cs
new file mode 100644
index 00000000..08f00867
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/ExternalUIHandler.cs
@@ -0,0 +1,223 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Collections;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Defines a callback function that the installer calls for progress notification and error messages.
+    /// </summary>
+    public delegate MessageResult ExternalUIHandler(
+        InstallMessage messageType,
+        string message,
+        MessageButtons buttons,
+        MessageIcon icon,
+        MessageDefaultButton defaultButton);
+
+    /// <summary>
+    /// [MSI 3.1] Defines a callback function that the installer calls for record-based progress notification and error messages.
+    /// </summary>
+    public delegate MessageResult ExternalUIRecordHandler(
+        InstallMessage messageType,
+        Record messageRecord,
+        MessageButtons buttons,
+        MessageIcon icon,
+        MessageDefaultButton defaultButton);
+
+    internal delegate int NativeExternalUIHandler(IntPtr context, int messageType, [MarshalAs(UnmanagedType.LPWStr)] string message);
+
+    internal delegate int NativeExternalUIRecordHandler(IntPtr context, int messageType, int recordHandle);
+
+    internal class ExternalUIProxy
+    {
+        private ExternalUIHandler handler;
+
+        internal ExternalUIProxy(ExternalUIHandler handler)
+        {
+            this.handler = handler;
+        }
+
+        public ExternalUIHandler Handler
+        {
+            get { return this.handler; }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        public int ProxyHandler(IntPtr contextPtr, int messageType, [MarshalAs(UnmanagedType.LPWStr)] string message)
+        {
+            try
+            {
+                int msgType   = messageType & 0x7F000000;
+                int buttons   = messageType & 0x0000000F;
+                int icon      = messageType & 0x000000F0;
+                int defButton = messageType & 0x00000F00;
+
+                return (int) this.handler(
+                        (InstallMessage) msgType,
+                        message,
+                        (MessageButtons) buttons,
+                        (MessageIcon) icon,
+                        (MessageDefaultButton) defButton);
+            }
+            catch
+            {
+                return (int) MessageResult.Error;
+            }
+        }
+    }
+
+    internal class ExternalUIRecordProxy
+    {
+        private ExternalUIRecordHandler handler;
+
+        internal ExternalUIRecordProxy(ExternalUIRecordHandler handler)
+        {
+            this.handler = handler;
+        }
+
+        public ExternalUIRecordHandler Handler
+        {
+            get { return this.handler; }
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        public int ProxyHandler(IntPtr contextPtr, int messageType, int recordHandle)
+        {
+            try
+            {
+                int msgType   = messageType & 0x7F000000;
+                int buttons   = messageType & 0x0000000F;
+                int icon      = messageType & 0x000000F0;
+                int defButton = messageType & 0x00000F00;
+                
+                Record msgRec = (recordHandle != 0 ? Record.FromHandle((IntPtr) recordHandle, false) : null);
+                using (msgRec)
+                {
+                    return (int) this.handler(
+                        (InstallMessage) msgType,
+                        msgRec,
+                        (MessageButtons) buttons,
+                        (MessageIcon) icon,
+                        (MessageDefaultButton) defButton);
+                }
+            }
+            catch
+            {
+                return (int) MessageResult.Error;
+            }
+        }
+    }
+
+    public static partial class Installer
+    {
+        private static IList externalUIHandlers = ArrayList.Synchronized(new ArrayList());
+
+        /// <summary>
+        /// Enables an external user-interface handler. This external UI handler is called before the
+        /// normal internal user-interface handler. The external UI handler has the option to suppress
+        /// the internal UI by returning a non-zero value to indicate that it has handled the messages.
+        /// </summary>
+        /// <param name="uiHandler">A callback delegate that handles the UI messages</param>
+        /// <param name="messageFilter">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>
+        /// <returns>The previously set external handler, or null if there was no previously set handler</returns>
+        /// <remarks><p>
+        /// To restore the previous UI handler, a second call is made to SetExternalUI using the
+        /// ExternalUIHandler returned by the first call to SetExternalUI and specifying
+        /// <see cref="InstallLogModes.None"/> as the message filter.
+        /// </p><p>
+        /// The external user interface handler does not have full control over the external user
+        /// interface unless <see cref="SetInternalUI(InstallUIOptions)"/> is called with the uiLevel parameter set to
+        /// <see cref="InstallUIOptions.Silent"/>. If SetInternalUI is not called, the internal user
+        /// interface level defaults to <see cref="InstallUIOptions.Basic"/>. As a result, any message not
+        /// handled by the external user interface handler is handled by Windows Installer. The initial
+        /// "Preparing to install..." dialog always appears even if the external user interface
+        /// handler handles all messages.
+        /// </p><p>
+        /// SetExternalUI should only be called from a bootstrapping application. You cannot call
+        /// it from a custom action
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetexternalui.asp">MsiSetExternalUI</a>
+        /// </p></remarks>
+        public static ExternalUIHandler SetExternalUI(ExternalUIHandler uiHandler, InstallLogModes messageFilter)
+        {
+            NativeExternalUIHandler nativeHandler = null;
+            if (uiHandler != null)
+            {
+                nativeHandler = new ExternalUIProxy(uiHandler).ProxyHandler;
+                Installer.externalUIHandlers.Add(nativeHandler);
+            }
+            NativeExternalUIHandler oldNativeHandler = NativeMethods.MsiSetExternalUI(nativeHandler, (uint) messageFilter, IntPtr.Zero);
+            if (oldNativeHandler != null && oldNativeHandler.Target is ExternalUIProxy)
+            {
+                Installer.externalUIHandlers.Remove(oldNativeHandler);
+                return ((ExternalUIProxy) oldNativeHandler.Target).Handler;
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// [MSI 3.1] Enables a record-based external user-interface handler. This external UI handler is called
+        /// before the normal internal user-interface handler. The external UI handler has the option to suppress
+        /// the internal UI by returning a non-zero value to indicate that it has handled the messages.
+        /// </summary>
+        /// <param name="uiHandler">A callback delegate that handles the UI messages</param>
+        /// <param name="messageFilter">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>
+        /// <returns>The previously set external handler, or null if there was no previously set handler</returns>
+        /// <remarks><p>
+        /// To restore the previous UI handler, a second call is made to SetExternalUI using the
+        /// ExternalUIHandler returned by the first call to SetExternalUI and specifying
+        /// <see cref="InstallLogModes.None"/> as the message filter.
+        /// </p><p>
+        /// The external user interface handler does not have full control over the external user
+        /// interface unless <see cref="SetInternalUI(InstallUIOptions)"/> is called with the uiLevel parameter set to
+        /// <see cref="InstallUIOptions.Silent"/>. If SetInternalUI is not called, the internal user
+        /// interface level defaults to <see cref="InstallUIOptions.Basic"/>. As a result, any message not
+        /// handled by the external user interface handler is handled by Windows Installer. The initial
+        /// "Preparing to install..." dialog always appears even if the external user interface
+        /// handler handles all messages.
+        /// </p><p>
+        /// SetExternalUI should only be called from a bootstrapping application. You cannot call
+        /// it from a custom action
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetexternaluirecord.asp">MsiSetExternalUIRecord</a>
+        /// </p></remarks>
+        public static ExternalUIRecordHandler SetExternalUI(ExternalUIRecordHandler uiHandler, InstallLogModes messageFilter)
+        {
+            NativeExternalUIRecordHandler nativeHandler = null;
+            if (uiHandler != null)
+            {
+                nativeHandler = new ExternalUIRecordProxy(uiHandler).ProxyHandler;
+                Installer.externalUIHandlers.Add(nativeHandler);
+            }
+            NativeExternalUIRecordHandler oldNativeHandler;
+            uint ret = NativeMethods.MsiSetExternalUIRecord(nativeHandler, (uint) messageFilter, IntPtr.Zero, out oldNativeHandler);
+            if (ret != 0)
+            {
+                Installer.externalUIHandlers.Remove(nativeHandler);
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+
+            if (oldNativeHandler != null && oldNativeHandler.Target is ExternalUIRecordProxy)
+            {
+                Installer.externalUIHandlers.Remove(oldNativeHandler);
+                return ((ExternalUIRecordProxy) oldNativeHandler.Target).Handler;
+            }
+            else
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/FeatureInfo.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/FeatureInfo.cs
new file mode 100644
index 00000000..9a1a859a
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/FeatureInfo.cs
@@ -0,0 +1,497 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Collections;
+    using System.Collections.Generic;
+
+    /// <summary>
+    /// Accessor for information about features within the context of an installation session.
+    /// </summary>
+    public sealed class FeatureInfoCollection : ICollection<FeatureInfo>
+    {
+        private Session session;
+
+        internal FeatureInfoCollection(Session session)
+        {
+            this.session = session;
+        }
+
+        /// <summary>
+        /// Gets information about a feature within the context of an installation session.
+        /// </summary>
+        /// <param name="feature">name of the feature</param>
+        /// <returns>feature object</returns>
+        public FeatureInfo this[string feature]
+        {
+            get
+            {
+                return new FeatureInfo(this.session, feature);
+            }
+        }
+
+        void ICollection<FeatureInfo>.Add(FeatureInfo item)
+        {
+            throw new InvalidOperationException();
+        }
+
+        void ICollection<FeatureInfo>.Clear()
+        {
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Checks if the collection contains a feature.
+        /// </summary>
+        /// <param name="feature">name of the feature</param>
+        /// <returns>true if the feature is in the collection, else false</returns>
+        public bool Contains(string feature)
+        {
+            return this.session.Database.CountRows(
+                "Feature", "`Feature` = '" + feature + "'") == 1;
+        }
+
+        bool ICollection<FeatureInfo>.Contains(FeatureInfo item)
+        {
+            return item != null && this.Contains(item.Name);
+        }
+
+        /// <summary>
+        /// Copies the features into an array.
+        /// </summary>
+        /// <param name="array">array that receives the features</param>
+        /// <param name="arrayIndex">offset into the array</param>
+        public void CopyTo(FeatureInfo[] array, int arrayIndex)
+        {
+            foreach (FeatureInfo feature in this)
+            {
+                array[arrayIndex++] = feature;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of features defined for the product.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return this.session.Database.CountRows("Feature");
+            }
+        }
+
+        bool ICollection<FeatureInfo>.IsReadOnly
+        {
+            get
+            {
+                return true;
+            }
+        }
+
+        bool ICollection<FeatureInfo>.Remove(FeatureInfo item)
+        {
+            throw new InvalidOperationException();
+        }
+
+        /// <summary>
+        /// Enumerates the features in the collection.
+        /// </summary>
+        /// <returns>an enumerator over all features in the collection</returns>
+        public IEnumerator<FeatureInfo> GetEnumerator()
+        {
+            using (View featureView = this.session.Database.OpenView(
+                "SELECT `Feature` FROM `Feature`"))
+            {
+                featureView.Execute();
+
+                foreach (Record featureRec in featureView) using (featureRec)
+                {
+                    string feature = featureRec.GetString(1);
+                    yield return new FeatureInfo(this.session, feature);
+                }
+            }
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+
+    /// <summary>
+    /// Provides access to information about a feature within the context of an installation session.
+    /// </summary>
+    public class FeatureInfo
+    {
+        private Session session;
+        private string name;
+
+        internal FeatureInfo(Session session, string name)
+        {
+            this.session = session;
+            this.name = name;
+        }
+
+        /// <summary>
+        /// Gets the name of the feature (primary key in the Feature table).
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return this.name;
+            }
+        }
+
+        /// <summary>
+        /// Gets the current install state of the feature.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentException">an unknown feature was requested</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeaturestate.asp">MsiGetFeatureState</a>
+        /// </p></remarks>
+        public InstallState CurrentState
+        {
+            get
+            {
+                int installState, actionState;
+                uint ret = RemotableNativeMethods.MsiGetFeatureState((int) this.session.Handle, this.name, out installState, out actionState);
+                if (ret != 0)
+                {
+                    if (ret == (uint) NativeMethods.Error.UNKNOWN_FEATURE)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret, this.name);
+                    }
+                    else
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                }
+
+                if (installState == (int) InstallState.Advertised)
+                {
+                    return InstallState.Advertised;
+                }
+                return (InstallState) installState;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the action state of the feature.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentException">an unknown feature was requested</exception>
+        /// <remarks><p>
+        /// When changing the feature action, the action state of all the Components linked to the changed
+        /// Feature records are also updated appropriately, based on the new feature Select state.
+        /// All Features can be configured at once by specifying the keyword ALL instead of a specific feature name.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeaturestate.asp">MsiGetFeatureState</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetfeaturestate.asp">MsiSetFeatureState</a>
+        /// </p></remarks>
+        public InstallState RequestState
+        {
+            get
+            {
+                int installState, actionState;
+                uint ret = RemotableNativeMethods.MsiGetFeatureState((int) this.session.Handle, this.name, out installState, out actionState);
+                if (ret != 0)
+                {
+                    if (ret == (uint) NativeMethods.Error.UNKNOWN_FEATURE)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret, this.name);
+                    }
+                    else
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                }
+                return (InstallState) actionState;
+            }
+
+            set
+            {
+                uint ret = RemotableNativeMethods.MsiSetFeatureState((int) this.session.Handle, this.name, (int) value);
+                if (ret != 0)
+                {
+                    if (ret == (uint) NativeMethods.Error.UNKNOWN_FEATURE)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret, this.name);
+                    }
+                    else
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets a list of valid installation states for the feature.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentException">an unknown feature was requested</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeaturevalidstates.asp">MsiGetFeatureValidStates</a>
+        /// </p></remarks>
+        public ICollection<InstallState> ValidStates
+        {
+            get
+            {
+                List<InstallState> states = new List<InstallState>();
+                uint installState;
+                uint ret = RemotableNativeMethods.MsiGetFeatureValidStates((int) this.session.Handle, this.name, out installState);
+                if (ret != 0)
+                {
+                    if (ret == (uint) NativeMethods.Error.UNKNOWN_FEATURE)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret, this.name);
+                    }
+                    else
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                }
+
+                for (int i = 1; i <= (int) InstallState.Default; i++)
+                {
+                    if (((int) installState & (1 << i)) != 0)
+                    {
+                        states.Add((InstallState) i);
+                    }
+                }
+                return states.AsReadOnly();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the attributes of the feature.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentException">an unknown feature was requested</exception>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeatureinfo.asp">MsiGetFeatureInfo</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetfeatureattributes.asp">MsiSetFeatureAttributes</a>
+        /// </p><p>
+        /// Since the lpAttributes paramter of
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeatureinfo.asp">MsiGetFeatureInfo</a>
+        /// does not contain an equivalent flag for <see cref="FeatureAttributes.UIDisallowAbsent"/>, this flag will
+        /// not be retrieved.
+        /// </p><p>
+        /// Since the dwAttributes parameter of 
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetfeatureattributes.asp">MsiSetFeatureAttributes</a>
+        /// does not contain an equivalent flag for <see cref="FeatureAttributes.UIDisallowAbsent"/>, the presence
+        /// of this flag will be ignored.
+        /// </p></remarks>
+        public FeatureAttributes Attributes
+        {
+            get
+            {
+                FeatureAttributes attributes;
+                uint titleBufSize = 0;
+                uint descBufSize = 0;
+                uint attr;
+                uint ret = NativeMethods.MsiGetFeatureInfo(
+                    (int) this.session.Handle,
+                    this.name,
+                    out attr,
+                    null,
+                    ref titleBufSize,
+                    null,
+                    ref descBufSize);
+
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+
+                // Values for attributes that MsiGetFeatureInfo returns are 
+                // double the values in the Attributes column of the Feature Table.
+                attributes = (FeatureAttributes) (attr >> 1);
+
+                // MsiGetFeatureInfo MSDN documentation indicates 
+                // NOUNSUPPORTEDADVERTISE is 32.  Conversion above changes this to 16
+                // which is UIDisallowAbsent.  MsiGetFeatureInfo isn't documented to 
+                // return an attribute for 'UIDisallowAbsent', so if UIDisallowAbsent
+                // is set, change it to NoUnsupportedAdvertise which then maps correctly
+                // to NOUNSUPPORTEDADVERTISE.
+                if ((attributes & FeatureAttributes.UIDisallowAbsent) == FeatureAttributes.UIDisallowAbsent)
+                {
+                    attributes &= ~FeatureAttributes.UIDisallowAbsent;
+                    attributes |= FeatureAttributes.NoUnsupportedAdvertise;
+                }
+
+                return attributes;
+            }
+
+            set
+            {
+                // MsiSetFeatureAttributes doesn't indicate UIDisallowAbsent is valid
+                // so remove it.
+                FeatureAttributes attributes = value;
+                attributes &= ~FeatureAttributes.UIDisallowAbsent;
+
+                // Values for attributes that MsiSetFeatureAttributes uses are 
+                // double the values in the Attributes column of the Feature Table.
+                uint attr = ((uint) attributes) << 1;
+
+                // MsiSetFeatureAttributes MSDN documentation indicates 
+                // NOUNSUPPORTEDADVERTISE is 32.  Conversion above changes this to 64
+                // which is undefined.  Change this back to 32.
+                uint noUnsupportedAdvertiseDbl = ((uint)FeatureAttributes.NoUnsupportedAdvertise) << 1;
+                if ((attr & noUnsupportedAdvertiseDbl) == noUnsupportedAdvertiseDbl)
+                {
+                    attr &= ~noUnsupportedAdvertiseDbl;
+                    attr |= (uint) FeatureAttributes.NoUnsupportedAdvertise;
+                }
+
+                uint ret = RemotableNativeMethods.MsiSetFeatureAttributes((int) this.session.Handle, this.name, attr);
+                
+                if (ret != (uint)NativeMethods.Error.SUCCESS)
+                {
+                    if (ret == (uint)NativeMethods.Error.UNKNOWN_FEATURE)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret, this.name);
+                    }
+                    else
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the title of the feature.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentException">an unknown feature was requested</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeatureinfo.asp">MsiGetFeatureInfo</a>
+        /// </p></remarks>
+        public string Title
+        {
+            get
+            {
+                StringBuilder titleBuf = new StringBuilder(80);
+                uint titleBufSize = (uint) titleBuf.Capacity;
+                uint descBufSize = 0;
+                uint attr;
+                uint ret = NativeMethods.MsiGetFeatureInfo(
+                    (int) this.session.Handle,
+                    this.name,
+                    out attr,
+                    titleBuf,
+                    ref titleBufSize,
+                    null,
+                    ref descBufSize);
+
+                if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                {
+                    titleBuf.Capacity = (int) ++titleBufSize;
+                    ret = NativeMethods.MsiGetFeatureInfo(
+                        (int) this.session.Handle,
+                        this.name,
+                        out attr,
+                        titleBuf,
+                        ref titleBufSize,
+                        null,
+                        ref descBufSize);
+                }
+
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+
+                return titleBuf.ToString();
+            }
+        }
+
+        /// <summary>
+        /// Gets the description of the feature.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentException">an unknown feature was requested</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeatureinfo.asp">MsiGetFeatureInfo</a>
+        /// </p></remarks>
+        public string Description
+        {
+            get
+            {
+                StringBuilder descBuf = new StringBuilder(256);
+                uint titleBufSize = 0;
+                uint descBufSize = (uint) descBuf.Capacity;
+                uint attr;
+                uint ret = NativeMethods.MsiGetFeatureInfo(
+                    (int) this.session.Handle,
+                    this.name,
+                    out attr,
+                    null,
+                    ref titleBufSize,
+                    descBuf,
+                    ref descBufSize);
+
+                if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                {
+                    descBuf.Capacity = (int) ++descBufSize;
+                    ret = NativeMethods.MsiGetFeatureInfo(
+                        (int) this.session.Handle,
+                        this.name,
+                        out attr,
+                        null,
+                        ref titleBufSize,
+                        descBuf,
+                        ref descBufSize);
+                }
+
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+
+                return descBuf.ToString();
+            }
+        }
+
+        /// <summary>
+        /// Calculates the disk space required by the feature and its selected children and parent features.
+        /// </summary>
+        /// <param name="includeParents">If true, the parent features are included in the cost.</param>
+        /// <param name="includeChildren">If true, the child features are included in the cost.</param>
+        /// <param name="installState">Specifies the installation state.</param>
+        /// <returns>The disk space requirement in bytes.</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeaturecost.asp">MsiGetFeatureCost</a>
+        /// </p></remarks>
+        public long GetCost(bool includeParents, bool includeChildren, InstallState installState)
+        {
+            const int MSICOSTTREE_CHILDREN = 1;
+            const int MSICOSTTREE_PARENTS = 2;
+
+            int cost;
+            uint ret = RemotableNativeMethods.MsiGetFeatureCost(
+                (int) this.session.Handle,
+                this.name,
+                (includeParents ? MSICOSTTREE_PARENTS : 0) | (includeChildren ? MSICOSTTREE_CHILDREN : 0),
+                (int) installState,
+                out cost);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return cost * 512L;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/FeatureInstallation.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/FeatureInstallation.cs
new file mode 100644
index 00000000..aa8ffe34
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/FeatureInstallation.cs
@@ -0,0 +1,174 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Represents an instance of a feature of an installed product.
+    /// </summary>
+    public class FeatureInstallation : InstallationPart
+    {
+        /// <summary>
+        /// Creates a new FeatureInstallation instance for a feature of a product.
+        /// </summary>
+        /// <param name="featureName">feature name</param>
+        /// <param name="productCode">ProductCode GUID</param>
+        public FeatureInstallation(string featureName, string productCode)
+            : base(featureName, productCode)
+        {
+            if (String.IsNullOrEmpty(featureName))
+            {
+                throw new ArgumentNullException("featureName");
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the feature.
+        /// </summary>
+        public string FeatureName
+        {
+            get
+            {
+                return this.Id;
+            }
+        }
+
+        /// <summary>
+        /// Gets the installed state of the feature.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiqueryfeaturestate.asp">MsiQueryFeatureState</a>
+        /// </p></remarks>
+        public override InstallState State
+        {
+            get
+            {
+                int installState = NativeMethods.MsiQueryFeatureState(
+                    this.ProductCode, this.FeatureName);
+                return (InstallState) installState;
+            }
+        }
+
+        /// <summary>
+        /// Gets the parent of the feature, or null if the feature has no parent (it is a root feature).
+        /// </summary>
+        /// <remarks>
+        /// Invocation of this property may be slightly costly for products with many features,
+        /// because it involves an enumeration of all the features in the product.
+        /// </remarks>
+        public FeatureInstallation Parent
+        {
+            get
+            {
+                StringBuilder featureBuf = new StringBuilder(256);
+                StringBuilder parentBuf = new StringBuilder(256);
+                for (uint i = 0; ; i++)
+                {
+                    uint ret = NativeMethods.MsiEnumFeatures(this.ProductCode, i, featureBuf, parentBuf);
+
+                    if (ret != 0)
+                    {
+                        break;
+                    }
+
+                    if (featureBuf.ToString() == this.FeatureName)
+                    {
+                        if (parentBuf.Length > 0)
+                        {
+                            return new FeatureInstallation(parentBuf.ToString(), this.ProductCode);
+                        }
+                        else
+                        {
+                            return null;
+                        }
+                    }
+                }
+
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the usage metrics for the feature.
+        /// </summary>
+        /// <remarks><p>
+        /// If no usage metrics are recorded, the <see cref="UsageData.UseCount" /> value is 0.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfeatureusage.asp">MsiGetFeatureUsage</a>
+        /// </p></remarks>
+        public FeatureInstallation.UsageData Usage
+        {
+            get
+            {
+                uint useCount;
+                ushort useDate;
+                uint ret = NativeMethods.MsiGetFeatureUsage(
+                    this.ProductCode, this.FeatureName, out useCount, out useDate);
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+
+                DateTime lastUsedDate;
+                if (useCount == 0)
+                {
+                    lastUsedDate = DateTime.MinValue;
+                }
+                else
+                {
+                    lastUsedDate = new DateTime(
+                        1980 + (useDate >> 9),
+                        (useDate & 0x01FF) >> 5,
+                        (useDate & 0x001F));
+                }
+
+                return new UsageData((int) useCount, lastUsedDate);
+            }
+        }
+
+        /// <summary>
+        /// Holds data about the usage of a feature.
+        /// </summary>
+        [SuppressMessage("Microsoft.Design", "CA1034:NestedTypesShouldNotBeVisible")]
+        [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes")]
+        public struct UsageData
+        {
+            private int useCount;
+            private DateTime lastUsedDate;
+
+            internal UsageData(int useCount, DateTime lastUsedDate)
+            {
+                this.useCount = useCount;
+                this.lastUsedDate = lastUsedDate;
+            }
+
+            /// <summary>
+            /// Gets count of the number of times the feature has been used.
+            /// </summary>
+            public int UseCount
+            {
+                get
+                {
+                    return this.useCount;
+                }
+            }
+
+            /// <summary>
+            /// Gets the date the feature was last used.
+            /// </summary>
+            public DateTime LastUsedDate
+            {
+                get
+                {
+                    return this.lastUsedDate;
+                }
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Handle.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/Handle.cs
new file mode 100644
index 00000000..c3d3625f
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Handle.cs
@@ -0,0 +1,154 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.ComponentModel;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Base class for Windows Installer handle types (Database, View, Record, SummaryInfo).
+    /// </summary>
+    /// <remarks><p>
+    /// These classes implement the <see cref="IDisposable"/> interface, because they
+    /// hold unmanaged resources (MSI handles) that should be properly disposed
+    /// when no longer needed.
+    /// </p></remarks>
+    public abstract class InstallerHandle : MarshalByRefObject, IDisposable
+    {
+        private NativeMethods.MsiHandle handle;
+
+        /// <summary>
+        /// Constructs a handle object from a native integer handle.
+        /// </summary>
+        /// <param name="handle">Native integer handle.</param>
+        /// <param name="ownsHandle">true to close the handle when this object is disposed or finalized</param>
+        protected InstallerHandle(IntPtr handle, bool ownsHandle)
+        {
+            if (handle == IntPtr.Zero)
+            {
+                throw new InvalidHandleException();
+            }
+
+            this.handle = new NativeMethods.MsiHandle(handle, ownsHandle);
+        }
+
+        /// <summary>
+        /// Gets the native integer handle.
+        /// </summary>
+        [SuppressMessage("Microsoft.Design", "CA1065:DoNotRaiseExceptionsInUnexpectedLocations")]
+        public IntPtr Handle
+        {
+            get
+            {
+                if (this.IsClosed)
+                {
+                    throw new InvalidHandleException();
+                }
+                return this.handle;
+            }
+        }
+
+        /// <summary>
+        /// Checks if the handle is closed. When closed, method calls on the handle object may throw an <see cref="InvalidHandleException"/>.
+        /// </summary>
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public bool IsClosed
+        {
+            get
+            {
+                return this.handle.IsClosed;
+            }
+        }
+
+        /// <summary>
+        /// Closes the handle.  After closing a handle, further method calls may throw an <see cref="InvalidHandleException"/>.
+        /// </summary>
+        /// <remarks><p>
+        /// The finalizer of this class will NOT close the handle if it is still open,
+        /// because finalization can run on a separate thread from the application,
+        /// resulting in potential problems if handles are closed from that thread.
+        /// It is best that the handle be closed manually as soon as it is no longer needed,
+        /// as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiclosehandle.asp">MsiCloseHandle</a>
+        /// </p></remarks>
+        /// <seealso cref="Close"/>
+        public void Dispose() 
+        {
+            this.Dispose(true);
+            GC.SuppressFinalize(this); 
+        }
+
+        /// <summary>
+        /// Closes the handle.  After closing a handle, further method calls may throw an <see cref="InvalidHandleException"/>.
+        /// </summary>
+        /// <remarks><p>
+        /// The finalizer of this class will NOT close the handle if it is still open,
+        /// because finalization can run on a separate thread from the application,
+        /// resulting in potential problems if handles are closed from that thread.
+        /// It is best that the handle be closed manually as soon as it is no longer needed,
+        /// as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// This method is merely an alias for the <see cref="Dispose()"/> method.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiclosehandle.asp">MsiCloseHandle</a>
+        /// </p></remarks>
+        public void Close()
+        {
+            this.Dispose();
+        }
+
+        /// <summary>
+        /// Tests whether this handle object is equal to another handle object.  Two handle objects are equal
+        /// if their types are the same and their native integer handles are the same.
+        /// </summary>
+        /// <param name="obj">The handle object to compare with the current handle object.</param>
+        /// <returns>true if the specified handle object is equal to the current handle object; otherwise false</returns>
+        public override bool Equals(object obj)
+        {
+            return (obj != null && this.GetType() == obj.GetType() &&
+                this.Handle == ((InstallerHandle) obj).Handle);
+        }
+
+        /// <summary>
+        /// Gets a hash value for the handle object.
+        /// </summary>
+        /// <returns>A hash code for the handle object.</returns>
+        /// <remarks><p>
+        /// The hash code is derived from the native integer handle.
+        /// </p></remarks>
+        public override int GetHashCode()
+        {
+            return this.Handle.GetHashCode();
+        }
+
+        /// <summary>
+        /// Gets an object that can be used internally for safe syncronization.
+        /// </summary>
+        internal object Sync
+        {
+            get
+            {
+                return this.handle;
+            }
+        }
+
+        /// <summary>
+        /// Closes the handle.  After closing a handle, further method calls may throw an <see cref="InvalidHandleException"/>.
+        /// </summary>
+        /// <param name="disposing">If true, the method has been called directly or indirectly by a user's code,
+        /// so managed and unmanaged resources will be disposed. If false, the method has been called by the 
+        /// runtime from inside the finalizer, and only unmanaged resources will be disposed.</param>
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        protected virtual void Dispose(bool disposing) 
+        {
+            if (disposing) 
+            {
+                this.handle.Dispose();
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/IEmbeddedUI.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/IEmbeddedUI.cs
new file mode 100644
index 00000000..d77c82a9
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/IEmbeddedUI.cs
@@ -0,0 +1,67 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// [MSI 4.5] Interface for an embedded external user interface for an installation.
+    /// </summary>
+    /// <remarks>
+    /// Classes which implement this interface must have a public constructor that takes no parameters.
+    /// </remarks>
+    public interface IEmbeddedUI
+    {
+        /// <summary>
+        /// Initializes the embedded UI.
+        /// </summary>
+        /// <param name="session">Handle to the installer which can be used to get and set properties.
+        /// The handle is only valid for the duration of this method call.</param>
+        /// <param name="resourcePath">Path to the directory that contains all the files from the MsiEmbeddedUI table.</param>
+        /// <param name="internalUILevel">On entry, contains the current UI level for the installation. After this
+        /// method returns, the installer resets the UI level to the returned value of this parameter.</param>
+        /// <returns>True if the embedded UI was successfully initialized; false if the installation
+        /// should continue without the embedded UI.</returns>
+        /// <exception cref="InstallCanceledException">The installation was canceled by the user.</exception>
+        /// <exception cref="InstallerException">The embedded UI failed to initialize and
+        /// causes the installation to fail.</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/initializeembeddedui.asp">InitializeEmbeddedUI</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1045:DoNotPassTypesByReference")]
+        bool Initialize(Session session, string resourcePath, ref InstallUIOptions internalUILevel);
+
+        /// <summary>
+        /// Processes information and progress messages sent to the user interface.
+        /// </summary>
+        /// <param name="messageType">Message type.</param>
+        /// <param name="messageRecord">Record that contains message data.</param>
+        /// <param name="buttons">Message buttons.</param>
+        /// <param name="icon">Message box icon.</param>
+        /// <param name="defaultButton">Message box default button.</param>
+        /// <returns>Result of processing the message.</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/embeddeduihandler.asp">EmbeddedUIHandler</a>
+        /// </p></remarks>
+        MessageResult ProcessMessage(
+            InstallMessage messageType,
+            Record messageRecord,
+            MessageButtons buttons,
+            MessageIcon icon,
+            MessageDefaultButton defaultButton);
+
+        /// <summary>
+        /// Shuts down the embedded UI at the end of the installation.
+        /// </summary>
+        /// <remarks>
+        /// If the installation was canceled during initialization, this method will not be called.
+        /// If the installation was canceled or failed at any later point, this method will be called at the end.
+        /// <p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/shutdownembeddedui.asp">ShutdownEmbeddedUI</a>
+        /// </p></remarks>
+        void Shutdown();
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallCost.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallCost.cs
new file mode 100644
index 00000000..f29612d6
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallCost.cs
@@ -0,0 +1,67 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Represents a per-drive disk space cost for an installation.
+    /// </summary>
+    [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes")]
+    public struct InstallCost
+    {
+        private string driveName;
+        private long cost;
+        private long tempCost;
+
+        /// <summary>
+        /// Creates a new InstallCost object.
+        /// </summary>
+        /// <param name="driveName">name of the drive this cost data applies to</param>
+        /// <param name="cost">installation cost on this drive, as a number of bytes</param>
+        /// <param name="tempCost">temporary disk space required on this drive, as a number of bytes</param>
+        internal InstallCost(string driveName, long cost, long tempCost)
+        {
+            this.driveName = driveName;
+            this.cost = cost;
+            this.tempCost = tempCost;
+        }
+
+        /// <summary>
+        /// The name of the drive this cost data applies to.
+        /// </summary>
+        public string DriveName
+        {
+            get
+            {
+                return this.driveName;
+            }
+        }
+
+        /// <summary>
+        /// The installation cost on this drive, as a number of bytes.
+        /// </summary>
+        public long Cost
+        {
+            get
+            {
+                return this.cost;
+            }
+        }
+
+        /// <summary>
+        /// The temporary disk space required on this drive, as a number of bytes.
+        /// </summary>
+        /// <remarks><p>
+        /// This temporary space requirement is space needed only for the duration
+        /// of the installation, over the final footprint on disk.
+        /// </p></remarks>
+        public long TempCost
+        {
+            get
+            {
+                return this.tempCost;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Installation.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/Installation.cs
new file mode 100644
index 00000000..47ca00a1
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Installation.cs
@@ -0,0 +1,100 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Globalization;
+
+    /// <summary>
+    /// Subclasses of this abstract class represent a unique instance of a
+    /// registered product or patch installation.
+    /// </summary>
+    public abstract class Installation
+    {
+        private string installationCode;
+        private string userSid;
+        private UserContexts context;
+        private SourceList sourceList;
+
+        internal Installation(string installationCode, string userSid, UserContexts context)
+        {
+            if (context == UserContexts.Machine)
+            {
+                userSid = null;
+            }
+            this.installationCode = installationCode;
+            this.userSid = userSid;
+            this.context = context;
+        }
+
+        /// <summary>
+        /// Gets the user security identifier (SID) under which this product or patch
+        /// installation is available.
+        /// </summary>
+        public string UserSid
+        {
+            get
+            {
+                return this.userSid;
+            }
+        }
+
+        /// <summary>
+        /// Gets the user context of this product or patch installation.
+        /// </summary>
+        public UserContexts Context
+        {
+            get
+            {
+                return this.context;
+            }
+        }
+
+        /// <summary>
+        /// Gets the source list of this product or patch installation.
+        /// </summary>
+        public virtual SourceList SourceList
+        {
+            get
+            {
+                if (this.sourceList == null)
+                {
+                    this.sourceList = new SourceList(this);
+                }
+                return this.sourceList;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this product or patch is installed on the current system.
+        /// </summary>
+        public abstract bool IsInstalled
+        {
+            get;
+        }
+
+        internal string InstallationCode
+        {
+            get
+            {
+                return this.installationCode;
+            }
+        }
+
+        internal abstract int InstallationType
+        {
+            get;
+        }
+
+        /// <summary>
+        /// Gets a property about the product or patch installation.
+        /// </summary>
+        /// <param name="propertyName">Name of the property being retrieved.</param>
+        /// <returns></returns>
+        public abstract string this[string propertyName]
+        {
+            get;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallationPart.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallationPart.cs
new file mode 100644
index 00000000..ce5a6a94
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallationPart.cs
@@ -0,0 +1,82 @@
+// 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.Dtf.WindowsInstaller
+{
+    /// <summary>
+    /// Subclasses of this abstract class represent an instance
+    /// of a registered feature or component.
+    /// </summary>
+    public abstract class InstallationPart
+    {
+        private string id;
+        private string productCode;
+        private string userSid;
+        private UserContexts context;
+
+        internal InstallationPart(string id, string productCode)
+            : this(id, productCode, null, UserContexts.None)
+        {
+        }
+
+        internal InstallationPart(string id, string productCode, string userSid, UserContexts context)
+        {
+            this.id = id;
+            this.productCode = productCode;
+            this.userSid = userSid;
+            this.context = context;
+        }
+
+        internal string Id
+        {
+            get
+            {
+                return this.id;
+            }
+        }
+
+        internal string ProductCode
+        {
+            get
+            {
+                return this.productCode;
+            }
+        }
+
+        internal string UserSid
+        {
+            get
+            {
+                return this.userSid;
+            }
+        }
+
+        internal UserContexts Context
+        {
+            get
+            {
+                return this.context;
+            }
+        }
+
+        /// <summary>
+        /// Gets the product that this item is a part of.
+        /// </summary>
+        public ProductInstallation Product
+        {
+            get
+            {
+                return this.productCode != null ?
+                    new ProductInstallation(this.productCode, userSid, context) : null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the current installation state of the item.
+        /// </summary>
+        public abstract InstallState State
+        {
+            get;
+        }
+    }
+
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Installer.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/Installer.cs
new file mode 100644
index 00000000..8df0aed9
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Installer.cs
@@ -0,0 +1,890 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Resources;
+    using System.Reflection;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+/// <summary>
+/// Receives an exception from
+/// <see cref="Installer.DetermineApplicablePatches(string,string[],InapplicablePatchHandler,string,UserContexts)"/>
+/// indicating the reason a particular patch is not applicable to a product.
+/// </summary>
+/// <param name="patch">MSP file path, XML file path, or XML blob that was passed to 
+/// <see cref="Installer.DetermineApplicablePatches(string,string[],InapplicablePatchHandler,string,UserContexts)"/></param>
+/// <param name="exception">exception indicating the reason the patch is not applicable</param>
+/// <remarks><p>
+/// If <paramref name="exception"/> is an <see cref="InstallerException"/> or subclass, then
+/// its <see cref="InstallerException.ErrorCode"/> and <see cref="InstallerException.Message"/>
+/// properties will indicate a more specific reason the patch was not applicable.
+/// </p><p>
+/// The <paramref name="exception"/> could also be a FileNotFoundException if the
+/// patch string was a file path.
+/// </p></remarks>
+public delegate void InapplicablePatchHandler(string patch, Exception exception);
+
+/// <summary>
+/// Provides static methods for installing and configuring products and patches.
+/// </summary>
+public static partial class Installer
+{
+    private static bool rebootRequired;
+    private static bool rebootInitiated;
+    private static ResourceManager errorResources;
+
+    /// <summary>
+    /// Indicates whether a system reboot is required after running an installation or configuration operation.
+    /// </summary>
+    public static bool RebootRequired
+    {
+        get
+        {
+            return Installer.rebootRequired;
+        }
+    }
+
+    /// <summary>
+    /// Indicates whether a system reboot has been initiated after running an installation or configuration operation.
+    /// </summary>
+    public static bool RebootInitiated
+    {
+        get
+        {
+            return Installer.rebootInitiated;
+        }
+    }
+
+    /// <summary>
+    /// Enables the installer's internal user interface. Then this user interface is used
+    /// for all subsequent calls to user-interface-generating installer functions in this process.
+    /// </summary>
+    /// <param name="uiOptions">Specifies the level of complexity of the user interface</param>
+    /// <param name="windowHandle">Handle to a window, which becomes the owner of any user interface created.
+    /// A pointer to the previous owner of the user interface is returned.</param>
+    /// <returns>The previous user interface level</returns>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetinternalui.asp">MsiSetInternalUI</a>
+    /// </p></remarks>
+    [SuppressMessage("Microsoft.Design", "CA1045:DoNotPassTypesByReference")]
+    public static InstallUIOptions SetInternalUI(InstallUIOptions uiOptions, ref IntPtr windowHandle)
+    {
+        return (InstallUIOptions) NativeMethods.MsiSetInternalUI((uint) uiOptions, ref windowHandle);
+    }
+    
+    /// <summary>
+    /// Enables the installer's internal user interface. Then this user interface is used
+    /// for all subsequent calls to user-interface-generating installer functions in this process.
+    /// The owner of the user interface does not change.
+    /// </summary>
+    /// <param name="uiOptions">Specifies the level of complexity of the user interface</param>
+    /// <returns>The previous user interface level</returns>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetinternalui.asp">MsiSetInternalUI</a>
+    /// </p></remarks>
+    public static InstallUIOptions SetInternalUI(InstallUIOptions uiOptions)
+    {
+        return (InstallUIOptions) NativeMethods.MsiSetInternalUI((uint) uiOptions, IntPtr.Zero);
+    }
+
+    /// <summary>
+    /// Enables logging of the selected message type for all subsequent install sessions in
+    /// the current process space.
+    /// </summary>
+    /// <param name="logModes">One or more mode flags specifying the type of messages to log</param>
+    /// <param name="logFile">Full path to the log file.  A null path disables logging,
+    /// in which case the logModes paraneter is ignored.</param>
+    /// <exception cref="ArgumentException">an invalid log mode was specified</exception>
+    /// <remarks>This method takes effect on any new installation processes.  Calling this
+    /// method from within a custom action will not start logging for that installation.</remarks>
+    public static void EnableLog(InstallLogModes logModes, string logFile)
+    {
+        Installer.EnableLog(logModes, logFile, false, true);
+    }
+
+    /// <summary>
+    /// Enables logging of the selected message type for all subsequent install sessions in
+    /// the current process space.
+    /// </summary>
+    /// <param name="logModes">One or more mode flags specifying the type of messages to log</param>
+    /// <param name="logFile">Full path to the log file.  A null path disables logging,
+    /// in which case the logModes paraneter is ignored.</param>
+    /// <param name="append">If true, the log lines will be appended to any existing file content.
+    /// If false, the log file will be truncated if it exists.  The default is false.</param>
+    /// <param name="flushEveryLine">If true, the log will be flushed after every line.
+    /// If false, the log will be flushed every 20 lines.  The default is true.</param>
+    /// <exception cref="ArgumentException">an invalid log mode was specified</exception>
+    /// <remarks><p>
+    /// This method takes effect on any new installation processes.  Calling this
+    /// method from within a custom action will not start logging for that installation.
+    /// </p><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienablelog.asp">MsiEnableLog</a>
+    /// </p></remarks>
+    public static void EnableLog(InstallLogModes logModes, string logFile, bool append, bool flushEveryLine)
+    {
+        uint ret = NativeMethods.MsiEnableLog((uint) logModes, logFile, (append ? (uint) 1 : 0) + (flushEveryLine ? (uint) 2 : 0));
+        if (ret != 0 && ret != (uint) NativeMethods.Error.FILE_INVALID)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+    }
+
+    /// <summary>
+    /// increments the usage count for a particular feature and returns the installation state for
+    /// that feature. This method should be used to indicate an application's intent to use a feature.
+    /// </summary>
+    /// <param name="productCode">The product code of the product.</param>
+    /// <param name="feature">The feature to be used.</param>
+    /// <param name="installMode">Must have the value <see cref="InstallMode.NoDetection"/>.</param>
+    /// <returns>The installed state of the feature.</returns>
+    /// <remarks><p>
+    /// The UseFeature method should only be used on features known to be published. The application
+    /// should determine the status of the feature by calling either the FeatureState method or
+    /// Features method.
+    /// </p><p>
+    /// Win32 MSI APIs:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiusefeature.asp">MsiUseFeature</a>,
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiusefeatureex.asp">MsiUseFeatureEx</a>
+    /// </p></remarks>
+    public static InstallState UseFeature(string productCode, string feature, InstallMode installMode)
+    {
+        int installState = NativeMethods.MsiUseFeatureEx(productCode, feature, unchecked ((uint) installMode), 0);
+        return (InstallState) installState;
+    }
+
+    /// <summary>
+    /// Opens an installer package for use with functions that access the product database and install engine,
+    /// returning an Session object.
+    /// </summary>
+    /// <param name="packagePath">Path to the package</param>
+    /// <param name="ignoreMachineState">Specifies whether or not the create a Session object that ignores the
+    /// computer state and that is incapable of changing the current computer state. A value of false yields
+    /// the normal behavior.  A value of true creates a "safe" Session object that cannot change of the current
+    /// machine state.</param>
+    /// <returns>A Session object allowing access to the product database and install engine</returns>
+    /// <exception cref="InstallerException">The product could not be opened</exception>
+    /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+    /// <remarks><p>
+    /// Note that only one Session object can be opened by a single process. OpenPackage cannot be used in a
+    /// custom action because the active installation is the only session allowed.
+    /// </p><p>
+    /// A "safe" Session object ignores the current computer state when opening the package and prevents
+    /// changes to the current computer state.
+    /// </p><p>
+    /// The Session object should be <see cref="InstallerHandle.Close"/>d after use.
+    /// It is best that the handle be closed manually as soon as it is no longer
+    /// needed, as leaving lots of unused handles open can degrade performance.
+    /// </p><p>
+    /// Win32 MSI APIs:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiopenpackage.asp">MsiOpenPackage</a>,
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiopenpackageex.asp">MsiOpenPackageEx</a>
+    /// </p></remarks>
+    public static Session OpenPackage(string packagePath, bool ignoreMachineState)
+    {
+        int sessionHandle;
+        uint ret = NativeMethods.MsiOpenPackageEx(packagePath, ignoreMachineState ? (uint) 1 : 0, out sessionHandle);
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+        return new Session((IntPtr) sessionHandle, true);
+    }
+
+    /// <summary>
+    /// Opens an installer package for use with functions that access the product database and install engine,
+    /// returning an Session object.
+    /// </summary>
+    /// <param name="database">Database used to create the session</param>
+    /// <param name="ignoreMachineState">Specifies whether or not the create a Session object that ignores the
+    /// computer state and that is incapable of changing the current computer state. A value of false yields
+    /// the normal behavior.  A value of true creates a "safe" Session object that cannot change of the current
+    /// machine state.</param>
+    /// <returns>A Session object allowing access to the product database and install engine</returns>
+    /// <exception cref="InstallerException">The product could not be opened</exception>
+    /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+    /// <remarks><p>
+    /// Note that only one Session object can be opened by a single process. OpenPackage cannot be used in a
+    /// custom action because the active installation is the only session allowed.
+    /// </p><p>
+    /// A "safe" Session object ignores the current computer state when opening the package and prevents
+    /// changes to the current computer state.
+    /// </p><p>
+    /// The Session object should be <see cref="InstallerHandle.Close"/>d after use.
+    /// It is best that the handle be closed manually as soon as it is no longer
+    /// needed, as leaving lots of unused handles open can degrade performance.
+    /// </p><p>
+    /// Win32 MSI APIs:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiopenpackage.asp">MsiOpenPackage</a>,
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiopenpackageex.asp">MsiOpenPackageEx</a>
+    /// </p></remarks>
+    [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+    public static Session OpenPackage(Database database, bool ignoreMachineState)
+    {
+        if (database == null)
+        {
+            throw new ArgumentNullException("database");
+        }
+
+        return Installer.OpenPackage(
+            String.Format(CultureInfo.InvariantCulture, "#{0}", database.Handle),
+            ignoreMachineState);
+    }
+
+    /// <summary>
+    /// Opens an installer package for an installed product using the product code.
+    /// </summary>
+    /// <param name="productCode">Product code of the installed product</param>
+    /// <returns>A Session object allowing access to the product database and install engine,
+    /// or null if the specified product is not installed.</returns>
+    /// <exception cref="ArgumentException">An unknown product was requested</exception>
+    /// <exception cref="InstallerException">The product could not be opened</exception>
+    /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+    /// <remarks><p>
+    /// Note that only one Session object can be opened by a single process. OpenProduct cannot be
+    /// used in a custom action because the active installation is the only session allowed.
+    /// </p><p>
+    /// The Session object should be <see cref="InstallerHandle.Close"/>d after use.
+    /// It is best that the handle be closed manually as soon as it is no longer
+    /// needed, as leaving lots of unused handles open can degrade performance.
+    /// </p><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiopenproduct.asp">MsiOpenProduct</a>
+    /// </p></remarks>
+    public static Session OpenProduct(string productCode)
+    {
+        int sessionHandle;
+        uint ret = NativeMethods.MsiOpenProduct(productCode, out sessionHandle);
+        if (ret != 0)
+        {
+            if (ret == (uint) NativeMethods.Error.UNKNOWN_PRODUCT)
+            {
+                return null;
+            }
+            else
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+        return new Session((IntPtr) sessionHandle, true);
+    }
+
+    /// <summary>
+    /// Gets the full component path, performing any necessary installation. This method prompts for source if
+    /// necessary and increments the usage count for the feature.
+    /// </summary>
+    /// <param name="product">Product code for the product that contains the feature with the necessary component</param>
+    /// <param name="feature">Feature ID of the feature with the necessary component</param>
+    /// <param name="component">Component code of the necessary component</param>
+    /// <param name="installMode">Installation mode; this can also include bits from <see cref="ReinstallModes"/></param>
+    /// <returns>Path to the component</returns>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiprovidecomponent.asp">MsiProvideComponent</a>
+    /// </p></remarks>
+    public static string ProvideComponent(string product, string feature, string component, InstallMode installMode)
+    {
+        StringBuilder pathBuf = new StringBuilder(512);
+        uint pathBufSize = (uint) pathBuf.Capacity;
+        uint ret = NativeMethods.MsiProvideComponent(product, feature, component, unchecked((uint)installMode), pathBuf, ref pathBufSize);
+        if (ret == (uint) NativeMethods.Error.MORE_DATA)
+        {
+            pathBuf.Capacity = (int) ++pathBufSize;
+            ret = NativeMethods.MsiProvideComponent(product, feature, component, unchecked((uint)installMode), pathBuf, ref pathBufSize);
+        }
+
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+        return pathBuf.ToString();
+    }
+
+    /// <summary>
+    /// Gets the full component path for a qualified component that is published by a product and
+    /// performs any necessary installation. This method prompts for source if necessary and increments
+    /// the usage count for the feature.
+    /// </summary>
+    /// <param name="component">Specifies the component ID for the requested component. This may not be the
+    /// GUID for the component itself but rather a server that provides the correct functionality, as in the
+    /// ComponentId column of the PublishComponent table.</param>
+    /// <param name="qualifier">Specifies a qualifier into a list of advertising components (from PublishComponent Table).</param>
+    /// <param name="installMode">Installation mode; this can also include bits from <see cref="ReinstallModes"/></param>
+    /// <param name="product">Optional; specifies the product to match that has published the qualified component.</param>
+    /// <returns>Path to the component</returns>
+    /// <remarks><p>
+    /// Win32 MSI APIs:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiprovidequalifiedcomponent.asp">MsiProvideQualifiedComponent</a>
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiprovidequalifiedcomponentex.asp">MsiProvideQualifiedComponentEx</a>
+    /// </p></remarks>
+    public static string ProvideQualifiedComponent(string component, string qualifier, InstallMode installMode, string product)
+    {
+        StringBuilder pathBuf = new StringBuilder(512);
+        uint pathBufSize = (uint) pathBuf.Capacity;
+        uint ret = NativeMethods.MsiProvideQualifiedComponentEx(component, qualifier, unchecked((uint)installMode), product, 0, 0, pathBuf, ref pathBufSize);
+        if (ret == (uint) NativeMethods.Error.MORE_DATA)
+        {
+            pathBuf.Capacity = (int) ++pathBufSize;
+            ret = NativeMethods.MsiProvideQualifiedComponentEx(component, qualifier, unchecked((uint)installMode), product, 0, 0, pathBuf, ref pathBufSize);
+        }
+
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+        return pathBuf.ToString();
+    }
+
+    /// <summary>
+    /// Gets the full path to a Windows Installer component containing an assembly. This method prompts for a source and
+    /// increments the usage count for the feature.
+    /// </summary>
+    /// <param name="assemblyName">Assembly name</param>
+    /// <param name="appContext">Set to null for global assemblies. For private assemblies, set to the full path of the
+    /// application configuration file (.cfg file) or executable file (.exe) of the application to which the assembly
+    /// has been made private.</param>
+    /// <param name="installMode">Installation mode; this can also include bits from <see cref="ReinstallModes"/></param>
+    /// <param name="isWin32Assembly">True if this is a Win32 assembly, false if it is a .NET assembly</param>
+    /// <returns>Path to the assembly</returns>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiprovideassembly.asp">MsiProvideAssembly</a>
+    /// </p></remarks>
+    public static string ProvideAssembly(string assemblyName, string appContext, InstallMode installMode, bool isWin32Assembly)
+    {
+        StringBuilder pathBuf = new StringBuilder(512);
+        uint pathBufSize = (uint) pathBuf.Capacity;
+        uint ret = NativeMethods.MsiProvideAssembly(assemblyName, appContext, unchecked ((uint) installMode), (isWin32Assembly ? (uint) 1 : 0), pathBuf, ref pathBufSize);
+        if (ret == (uint) NativeMethods.Error.MORE_DATA)
+        {
+            pathBuf.Capacity = (int) ++pathBufSize;
+            ret = NativeMethods.MsiProvideAssembly(assemblyName, appContext, unchecked ((uint) installMode), (isWin32Assembly ? (uint) 1 : 0), pathBuf, ref pathBufSize);
+        }
+
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+        return pathBuf.ToString();
+    }
+
+    /// <summary>
+    /// Installs files that are unexpectedly missing.
+    /// </summary>
+    /// <param name="product">Product code for the product that owns the component to be installed</param>
+    /// <param name="component">Component to be installed</param>
+    /// <param name="installState">Specifies the way the component should be installed.</param>
+    /// <exception cref="InstallCanceledException">the user exited the installation</exception>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiinstallmissingcomponent.asp">MsiInstallMissingComponent</a>
+    /// </p></remarks>
+    public static void InstallMissingComponent(string product, string component, InstallState installState)
+    {
+        uint ret = NativeMethods.MsiInstallMissingComponent(product, component, (int) installState);
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+    }
+
+    /// <summary>
+    /// Installs files that are unexpectedly missing.
+    /// </summary>
+    /// <param name="product">Product code for the product that owns the file to be installed</param>
+    /// <param name="file">File to be installed</param>
+    /// <exception cref="InstallCanceledException">the user exited the installation</exception>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiinstallmissingfile.asp">MsiInstallMissingFile</a>
+    /// </p></remarks>
+    public static void InstallMissingFile(string product, string file)
+    {
+        uint ret = NativeMethods.MsiInstallMissingFile(product, file);
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+    }
+
+    /// <summary>
+    /// Reinstalls a feature.
+    /// </summary>
+    /// <param name="product">Product code for the product containing the feature to be reinstalled</param>
+    /// <param name="feature">Feature to be reinstalled</param>
+    /// <param name="reinstallModes">Reinstall modes</param>
+    /// <exception cref="InstallCanceledException">the user exited the installation</exception>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msireinstallfeature.asp">MsiReinstallFeature</a>
+    /// </p></remarks>
+    public static void ReinstallFeature(string product, string feature, ReinstallModes reinstallModes)
+    {
+        uint ret = NativeMethods.MsiReinstallFeature(product, feature, (uint) reinstallModes);
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+    }
+
+    /// <summary>
+    /// Reinstalls a product.
+    /// </summary>
+    /// <param name="product">Product code for the product to be reinstalled</param>
+    /// <param name="reinstallModes">Reinstall modes</param>
+    /// <exception cref="InstallCanceledException">the user exited the installation</exception>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msireinstallproduct.asp">MsiReinstallProduct</a>
+    /// </p></remarks>
+    public static void ReinstallProduct(string product, ReinstallModes reinstallModes)
+    {
+        uint ret = NativeMethods.MsiReinstallProduct(product, (uint) reinstallModes);
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+    }
+
+    /// <summary>
+    /// Opens an installer package and initializes an install session.
+    /// </summary>
+    /// <param name="packagePath">path to the patch package</param>
+    /// <param name="commandLine">command line property settings</param>
+    /// <exception cref="InstallerException">There was an error installing the product</exception>
+    /// <remarks><p>
+    /// To completely remove a product, set REMOVE=ALL in <paramRef name="commandLine"/>.
+    /// </p><p>
+    /// This method displays the user interface with the current settings and
+    /// log mode. You can change user interface settings with the <see cref="SetInternalUI(InstallUIOptions)"/>
+    /// and <see cref="SetExternalUI(ExternalUIHandler,InstallLogModes)"/> functions. You can set the log mode with the
+    /// <see cref="EnableLog(InstallLogModes,string)"/> function.
+    /// </p><p>
+    /// The <see cref="RebootRequired"/> and <see cref="RebootInitiated"/> properties should be
+    /// tested after calling this method.
+    /// </p><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiinstallproduct.asp">MsiInstallProduct</a>
+    /// </p></remarks>
+    public static void InstallProduct(string packagePath, string commandLine)
+    {
+        uint ret = NativeMethods.MsiInstallProduct(packagePath, commandLine);
+        Installer.CheckInstallResult(ret);
+    }
+
+    /// <summary>
+    /// Installs or uninstalls a product.
+    /// </summary>
+    /// <param name="productCode">Product code of the product to be configured.</param>
+    /// <param name="installLevel">Specifies the default installation configuration of the
+    /// product. The <paramref name="installLevel"/> parameter is ignored and all features
+    /// are installed if the <paramref name="installState"/> parameter is set to any other
+    /// value than <see cref="InstallState.Default"/>. This parameter must be either 0
+    /// (install using authored feature levels), 65535 (install all features), or a value
+    /// between 0 and 65535 to install a subset of available features.                                                                                                                                                                                                                                                                                                                                                     </param>
+    /// <param name="installState">Specifies the installation state for the product.</param>
+    /// <param name="commandLine">Specifies the command line property settings. This should
+    /// be a list of the format Property=Setting Property=Setting.</param>
+    /// <exception cref="InstallerException">There was an error configuring the product</exception>
+    /// <remarks><p>
+    /// This method displays the user interface with the current settings and
+    /// log mode. You can change user interface settings with the <see cref="SetInternalUI(InstallUIOptions)"/>
+    /// and <see cref="SetExternalUI(ExternalUIHandler,InstallLogModes)"/> functions. You can set the log mode with the
+    /// <see cref="EnableLog(InstallLogModes,string)"/> function.
+    /// </p><p>
+    /// The <see cref="RebootRequired"/> and <see cref="RebootInitiated"/> properties should be
+    /// tested after calling this method.
+    /// </p><p>
+    /// Win32 MSI APIs:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiconfigureproduct.asp">MsiConfigureProduct</a>,
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiconfigureproductex.asp">MsiConfigureProductEx</a>
+    /// </p></remarks>
+    public static void ConfigureProduct(string productCode, int installLevel, InstallState installState, string commandLine)
+    {
+        uint ret = NativeMethods.MsiConfigureProductEx(productCode, installLevel, (int) installState, commandLine);
+        Installer.CheckInstallResult(ret);
+    }
+
+    /// <summary>
+    /// Configures the installed state for a product feature.
+    /// </summary>
+    /// <param name="productCode">Product code of the product to be configured.</param>
+    /// <param name="feature">Specifies the feature ID for the feature to be configured.</param>
+    /// <param name="installState">Specifies the installation state for the feature.</param>
+    /// <exception cref="InstallerException">There was an error configuring the feature</exception>
+    /// <remarks><p>
+    /// The <see cref="RebootRequired"/> and <see cref="RebootInitiated"/> properties should be
+    /// tested after calling this method.
+    /// </p><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiconfigurefeature.asp">MsiConfigureFeature</a>
+    /// </p></remarks>
+    public static void ConfigureFeature(string productCode, string feature, InstallState installState)
+    {
+        uint ret = NativeMethods.MsiConfigureFeature(productCode, feature, (int) installState);
+        Installer.CheckInstallResult(ret);
+    }
+
+    /// <summary>
+    /// For each product listed by the patch package as eligible to receive the patch, ApplyPatch invokes
+    /// an installation and sets the PATCH property to the path of the patch package.
+    /// </summary>
+    /// <param name="patchPackage">path to the patch package</param>
+    /// <param name="commandLine">optional command line property settings</param>
+    /// <exception cref="InstallerException">There was an error applying the patch</exception>
+    /// <remarks><p>
+    /// The <see cref="RebootRequired"/> and <see cref="RebootInitiated"/> properties should be
+    /// tested after calling this method.
+    /// </p><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiapplypatch.asp">MsiApplyPatch</a>
+    /// </p></remarks>
+    public static void ApplyPatch(string patchPackage, string commandLine)
+    {
+        Installer.ApplyPatch(patchPackage, null, InstallType.Default, commandLine);
+    }
+
+    /// <summary>
+    /// For each product listed by the patch package as eligible to receive the patch, ApplyPatch invokes
+    /// an installation and sets the PATCH property to the path of the patch package.
+    /// </summary>
+    /// <param name="patchPackage">path to the patch package</param>
+    /// <param name="installPackage">path to the product to be patched, if installType
+    /// is set to <see cref="InstallType.NetworkImage"/></param>
+    /// <param name="installType">type of installation to patch</param>
+    /// <param name="commandLine">optional command line property settings</param>
+    /// <exception cref="InstallerException">There was an error applying the patch</exception>
+    /// <remarks><p>
+    /// The <see cref="RebootRequired"/> and <see cref="RebootInitiated"/> properties should be
+    /// tested after calling this method.
+    /// </p><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiapplypatch.asp">MsiApplyPatch</a>
+    /// </p></remarks>
+    public static void ApplyPatch(string patchPackage, string installPackage, InstallType installType, string commandLine)
+    {
+        uint ret = NativeMethods.MsiApplyPatch(patchPackage, installPackage, (int) installType, commandLine);
+        Installer.CheckInstallResult(ret);
+    }
+
+    /// <summary>
+    /// Removes one or more patches from a single product. To remove a patch from
+    /// multiple products, RemovePatches must be called for each product.
+    /// </summary>
+    /// <param name="patches">List of patches to remove. Each patch can be specified by the GUID
+    /// of the patch or the full path to the patch package.</param>
+    /// <param name="productCode">The ProductCode (GUID) of the product from which the patches
+    /// are removed.  This parameter cannot be null.</param>
+    /// <param name="commandLine">optional command line property settings</param>
+    /// <exception cref="InstallerException">There was an error removing the patches</exception>
+    /// <remarks><p>
+    /// The <see cref="RebootRequired"/> and <see cref="RebootInitiated"/> properties should be
+    /// tested after calling this method.
+    /// </p><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiremovepatches.asp">MsiRemovePatches</a>
+    /// </p></remarks>
+    public static void RemovePatches(IList<string> patches, string productCode, string commandLine)
+    {
+        if (patches == null || patches.Count == 0)
+        {
+            throw new ArgumentNullException("patches");
+        }
+
+        if (productCode == null)
+        {
+            throw new ArgumentNullException("productCode");
+        }
+
+        StringBuilder patchList = new StringBuilder();
+        foreach (string patch in patches)
+        {
+            if (patch != null)
+            {
+                if (patchList.Length != 0)
+                {
+                    patchList.Append(';');
+                }
+
+                patchList.Append(patch);
+            }
+        }
+
+        if (patchList.Length == 0)
+        {
+            throw new ArgumentNullException("patches");
+        }
+
+        uint ret = NativeMethods.MsiRemovePatches(patchList.ToString(), productCode, (int) InstallType.SingleInstance, commandLine);
+        Installer.CheckInstallResult(ret);
+    }
+
+    /// <summary>
+    /// Determines which patches apply to a specified product MSI and in what sequence.
+    /// </summary>
+    /// <param name="productPackage">Full path to an MSI file that is the target product
+    /// for the set of patches.</param>
+    /// <param name="patches">An array of strings specifying the patches to be checked.  Each item
+    /// may be the path to an MSP file, the path an XML file, or just an XML blob.</param>
+    /// <param name="errorHandler">Callback to be invoked for each inapplicable patch, reporting the
+    /// reason the patch is not applicable.  This value may be left null if that information is not
+    /// desired.</param>
+    /// <returns>An array of selected patch strings from <paramref name="patches"/>, indicating
+    /// the set of applicable patches.  The items are re-ordered to be in the best sequence.</returns>
+    /// <remarks><p>
+    /// If an item in <paramref name="patches"/> is a file path but does not end in .MSP or .XML,
+    /// it is assumed to be an MSP file.
+    /// </p><p>
+    /// As this overload uses InstallContext.None, it does not consider the current state of
+    /// the system.
+    /// </p><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidetermineapplicablepatches.asp">MsiDetermineApplicablePatches</a>
+    /// </p></remarks>
+    public static IList<string> DetermineApplicablePatches(
+        string productPackage,
+        string[] patches,
+        InapplicablePatchHandler errorHandler)
+    {
+        return DetermineApplicablePatches(productPackage, patches, errorHandler, null, UserContexts.None);
+    }
+
+    /// <summary>
+    /// Determines which patches apply to a specified product and in what sequence.  If
+    /// the product is installed, this method accounts for patches that have already been applied to
+    /// the product and accounts for obsolete and superceded patches.
+    /// </summary>
+    /// <param name="product">The product that is the target for the set of patches.  This may be
+    /// either a ProductCode (GUID) of a product that is currently installed, or the path to a an
+    /// MSI file.</param>
+    /// <param name="patches">An array of strings specifying the patches to be checked.  Each item
+    /// may be the path to an MSP file, the path an XML file, or just an XML blob.</param>
+    /// <param name="errorHandler">Callback to be invoked for each inapplicable patch, reporting the
+    /// reason the patch is not applicable.  This value may be left null if that information is not
+    /// desired.</param>
+    /// <param name="userSid">Specifies a security identifier (SID) of a user. This parameter restricts
+    /// the context of enumeration for this user account. This parameter cannot be the special SID
+    /// strings s-1-1-0 (everyone) or s-1-5-18 (local system). If <paramref name="context"/> is set to
+    /// <see cref="UserContexts.None"/> or <see cref="UserContexts.Machine"/>, then
+    /// <paramref name="userSid"/> must be null. For the current user context, <paramref name="userSid"/>
+    /// can be null and <paramref name="context"/> can be set to <see cref="UserContexts.UserManaged"/>
+    /// or <see cref="UserContexts.UserUnmanaged"/>.</param>
+    /// <param name="context">Restricts the enumeration to per-user-unmanaged, per-user-managed,
+    /// or per-machine context, or (if referring to an MSI) to no system context at all.  This
+    /// parameter can be <see cref="UserContexts.Machine"/>, <see cref="UserContexts.UserManaged"/>,
+    /// <see cref="UserContexts.UserUnmanaged"/>, or <see cref="UserContexts.None"/>.</param>
+    /// <returns>An array of selected patch strings from <paramref name="patches"/>, indicating
+    /// the set of applicable patches.  The items are re-ordered to be in the best sequence.</returns>
+    /// <remarks><p>
+    /// If an item in <paramref name="patches"/> is a file path but does not end in .MSP or .XML,
+    /// it is assumed to be an MSP file.
+    /// </p><p>
+    /// Passing an InstallContext of None only analyzes the MSI file; it does not consider the
+    /// current state of the system. You cannot use InstallContext.None with a ProductCode GUID.
+    /// </p><p>
+    /// Win32 MSI APIs:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidetermineapplicablepatches.asp">MsiDetermineApplicablePatches</a>
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msideterminepatchsequence.asp">MsiDeterminePatchSequence</a>
+    /// </p></remarks>
+    public static IList<string> DetermineApplicablePatches(
+        string product,
+        string[] patches,
+        InapplicablePatchHandler errorHandler,
+        string userSid,
+        UserContexts context)
+    {
+        if (String.IsNullOrEmpty(product))
+        {
+            throw new ArgumentNullException("product");
+        }
+
+        if (patches == null)
+        {
+            throw new ArgumentNullException("patches");
+        }
+
+        NativeMethods.MsiPatchSequenceData[] sequenceData = new NativeMethods.MsiPatchSequenceData[patches.Length];
+        for (int i = 0; i < patches.Length; i++)
+        {
+            if (String.IsNullOrEmpty(patches[i]))
+            {
+                throw new ArgumentNullException("patches[" + i + "]");
+            }
+
+            sequenceData[i].szPatchData = patches[i];
+            sequenceData[i].ePatchDataType = GetPatchStringDataType(patches[i]);
+            sequenceData[i].dwOrder = -1;
+            sequenceData[i].dwStatus = 0;
+        }
+        
+        uint ret;
+        if (context == UserContexts.None)
+        {
+            ret = NativeMethods.MsiDetermineApplicablePatches(product, (uint) sequenceData.Length, sequenceData);
+        }
+        else
+        {
+            ret = NativeMethods.MsiDeterminePatchSequence(product, userSid, context, (uint) sequenceData.Length, sequenceData);
+        }
+
+        if (errorHandler != null)
+        {
+            for (int i = 0; i < sequenceData.Length; i++)
+            {
+                if (sequenceData[i].dwOrder < 0 && sequenceData[i].dwStatus != 0)
+                {
+                    errorHandler(sequenceData[i].szPatchData, InstallerException.ExceptionFromReturnCode(sequenceData[i].dwStatus));
+                }
+            }
+        }
+
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+
+        IList<string> patchSeq = new List<string>(patches.Length);
+        for (int i = 0; i < sequenceData.Length; i++)
+        {
+            for (int j = 0; j < sequenceData.Length; j++)
+            {
+                if (sequenceData[j].dwOrder == i)
+                {
+                    patchSeq.Add(sequenceData[j].szPatchData);
+                }
+            }
+        }
+        return patchSeq;
+    }
+
+    /// <summary>
+    /// Applies one or more patches to products that are eligible to receive the patch.
+    /// For each product listed by the patch package as eligible to receive the patch, ApplyPatch invokes
+    /// an installation and sets the PATCH property to the path of the patch package.
+    /// </summary>
+    /// <param name="patchPackages">The set of patch packages to be applied.
+    /// Each item is the full path to an MSP file.</param>
+    /// <param name="productCode">Provides the ProductCode of the product being patched. If this parameter
+    /// is null, the patches are applied to all products that are eligible to receive these patches.</param>
+    /// <param name="commandLine">optional command line property settings</param>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiapplymultiplepatches.asp">MsiApplyMultiplePatches</a>
+    /// </p></remarks>
+    public static void ApplyMultiplePatches(
+        IList<string> patchPackages, string productCode, string commandLine)
+    {
+        if (patchPackages == null || patchPackages.Count == 0)
+        {
+            throw new ArgumentNullException("patchPackages");
+        }
+
+        StringBuilder patchList = new StringBuilder();
+        foreach (string patch in patchPackages)
+        {
+            if (patch != null)
+            {
+                if (patchList.Length != 0)
+                {
+                    patchList.Append(';');
+                }
+
+                patchList.Append(patch);
+            }
+        }
+
+        if (patchList.Length == 0)
+        {
+            throw new ArgumentNullException("patchPackages");
+        }
+
+        uint ret = NativeMethods.MsiApplyMultiplePatches(patchList.ToString(), productCode, commandLine);
+        Installer.CheckInstallResult(ret);
+    }
+
+    /// <summary>
+    /// Extracts information from a patch that can be used to determine whether the patch
+    /// applies on a target system. The method returns an XML string that can be provided to
+    /// <see cref="DetermineApplicablePatches(string,string[],InapplicablePatchHandler,string,UserContexts)"/>
+    /// instead of the full patch file.
+    /// </summary>
+    /// <param name="patchPath">Full path to the patch being queried.</param>
+    /// <returns>XML string containing patch data.</returns>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiextractpatchxmldata.asp">MsiExtractPatchXMLData</a>
+    /// </p></remarks>
+    public static string ExtractPatchXmlData(string patchPath)
+    {
+        StringBuilder buf = new StringBuilder("");
+        uint bufSize = 0;
+        uint ret = NativeMethods.MsiExtractPatchXMLData(patchPath, 0, buf, ref bufSize);
+        if (ret == (uint) NativeMethods.Error.MORE_DATA)
+        {
+            buf.Capacity = (int) ++bufSize;
+            ret = NativeMethods.MsiExtractPatchXMLData(patchPath, 0, buf, ref bufSize);
+        }
+
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+        return buf.ToString();
+    }
+
+    /// <summary>
+    /// [MSI 3.1] Migrates a user's application configuration data to a new SID.
+    /// </summary>
+    /// <param name="oldSid">Previous user SID that data is to be migrated from</param>
+    /// <param name="newSid">New user SID that data is to be migrated to</param>
+    /// <remarks><p>
+    /// Win32 MSI API:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msinotifysidchange.asp">MsiNotifySidChange</a>
+    /// </p></remarks>
+    public static void NotifySidChange(string oldSid, string newSid)
+    {
+        uint ret = NativeMethods.MsiNotifySidChange(oldSid, newSid);
+        if (ret != 0)
+        {
+            throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+    }
+
+    private static void CheckInstallResult(uint ret)
+    {
+        switch (ret)
+        {
+            case (uint) NativeMethods.Error.SUCCESS: break;
+            case (uint) NativeMethods.Error.SUCCESS_REBOOT_REQUIRED: Installer.rebootRequired = true; break;
+            case (uint) NativeMethods.Error.SUCCESS_REBOOT_INITIATED: Installer.rebootInitiated = true; break;
+            default: throw InstallerException.ExceptionFromReturnCode(ret);
+        }
+    }
+
+    private static int GetPatchStringDataType(string patchData)
+    {
+        if (patchData.IndexOf("<", StringComparison.Ordinal) >= 0 &&
+            patchData.IndexOf(">", StringComparison.Ordinal) >= 0)
+        {
+            return 2; // XML blob
+        }
+        else if (String.Compare(Path.GetExtension(patchData), ".xml",
+            StringComparison.OrdinalIgnoreCase) == 0)
+        {
+            return 1; // XML file path
+        }
+        else
+        {
+            return 0; // MSP file path
+        }
+    }
+}
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallerAdvertise.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallerAdvertise.cs
new file mode 100644
index 00000000..9da593d9
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallerAdvertise.cs
@@ -0,0 +1,270 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Reflection;
+    using System.Globalization;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+
+    public static partial class Installer
+    {
+        /// <summary>
+        /// Advertises a product to the local computer.
+        /// </summary>
+        /// <param name="packagePath">Path to the package of the product being advertised</param>
+        /// <param name="perUser">True if the product is user-assigned; false if it is machine-assigned.</param>
+        /// <param name="transforms">Semi-colon delimited list of transforms to be applied. This parameter may be null.</param>
+        /// <param name="locale">The language to use if the source supports multiple languages</param>
+        /// <exception cref="FileNotFoundException">the specified package file does not exist</exception>
+        /// <seealso cref="GenerateAdvertiseScript(string,string,string,int,ProcessorArchitecture,bool)"/>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiadvertiseproduct.asp">MsiAdvertiseProduct</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiadvertiseproductex.asp">MsiAdvertiseProductEx</a>
+        /// </p></remarks>
+        public static void AdvertiseProduct(string packagePath, bool perUser, string transforms, int locale)
+        {
+            if (String.IsNullOrEmpty(packagePath))
+            {
+                throw new ArgumentNullException("packagePath");
+            }
+
+            if (!File.Exists(packagePath))
+            {
+                throw new FileNotFoundException(null, packagePath);
+            }
+
+            uint ret = NativeMethods.MsiAdvertiseProduct(packagePath, new IntPtr(perUser ? 1 : 0), transforms, (ushort) locale);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Generates an advertise script. The method enables the installer to write to a 
+        /// script the registry and shortcut information used to assign or publish a product.
+        /// </summary>
+        /// <param name="packagePath">Path to the package of the product being advertised</param>
+        /// <param name="scriptFilePath">path to script file to be created with the advertise information</param>
+        /// <param name="transforms">Semi-colon delimited list of transforms to be applied. This parameter may be null.</param>
+        /// <param name="locale">The language to use if the source supports multiple languages</param>
+        /// <exception cref="FileNotFoundException">the specified package file does not exist</exception>
+        /// <seealso cref="AdvertiseProduct"/>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiadvertiseproduct.asp">MsiAdvertiseProduct</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiadvertiseproductex.asp">MsiAdvertiseProductEx</a>
+        /// </p></remarks>
+        public static void GenerateAdvertiseScript(string packagePath, string scriptFilePath, string transforms, int locale)
+        {
+            if (String.IsNullOrEmpty(packagePath))
+            {
+                throw new ArgumentNullException("packagePath");
+            }
+
+            if (!File.Exists(packagePath))
+            {
+                throw new FileNotFoundException(null, packagePath);
+            }
+
+            uint ret = NativeMethods.MsiAdvertiseProduct(packagePath, scriptFilePath, transforms, (ushort) locale);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Generates an advertise script. The method enables the installer to write to a 
+        /// script the registry and shortcut information used to assign or publish a product.
+        /// </summary>
+        /// <param name="packagePath">Path to the package of the product being advertised</param>
+        /// <param name="scriptFilePath">path to script file to be created with the advertise information</param>
+        /// <param name="transforms">Semi-colon delimited list of transforms to be applied. This parameter may be null.</param>
+        /// <param name="locale">The language to use if the source supports multiple languages</param>
+        /// <param name="processor">Targeted processor architecture.</param>
+        /// <param name="instance">True to install multiple instances through product code changing transform.
+        /// Advertises a new instance of the product. Requires that the <paramref name="transforms"/> parameter
+        /// includes the instance transform that changes the product code.</param>
+        /// <seealso cref="AdvertiseProduct"/>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiadvertiseproduct.asp">MsiAdvertiseProduct</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiadvertiseproductex.asp">MsiAdvertiseProductEx</a>
+        /// </p></remarks>
+        public static void GenerateAdvertiseScript(
+            string packagePath,
+            string scriptFilePath,
+            string transforms,
+            int locale,
+            ProcessorArchitecture processor,
+            bool instance)
+        {
+            if (String.IsNullOrEmpty(packagePath))
+            {
+                throw new ArgumentNullException("packagePath");
+            }
+
+            if (String.IsNullOrEmpty(scriptFilePath))
+            {
+                throw new ArgumentNullException("scriptFilePath");
+            }
+
+            if (!File.Exists(packagePath))
+            {
+                throw new FileNotFoundException(null, packagePath);
+            }
+
+            uint platform = 0;
+            switch (processor)
+            {
+                case ProcessorArchitecture.X86: platform = (uint) 1; break;
+                case ProcessorArchitecture.IA64: platform = (uint) 2; break;
+                case ProcessorArchitecture.Amd64: platform = (uint) 4; break;
+            }
+
+            uint ret = NativeMethods.MsiAdvertiseProductEx(
+                packagePath,
+                scriptFilePath,
+                transforms,
+                (ushort) locale,
+                platform,
+                instance ? (uint) 1 : 0);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Copies an advertise script file to the local computer.
+        /// </summary>
+        /// <param name="scriptFile">Path to a script file generated by
+        /// <see cref="GenerateAdvertiseScript(string,string,string,int,ProcessorArchitecture,bool)"/></param>
+        /// <param name="flags">Flags controlling advertisement</param>
+        /// <param name="removeItems">True if specified items are to be removed instead of being created</param>
+        /// <remarks><p>
+        /// The process calling this function must be running under the LocalSystem account. To advertise an
+        /// application for per-user installation to a targeted user, the thread that calls this function must
+        /// impersonate the targeted user. If the thread calling this function is not impersonating a targeted
+        /// user, the application is advertised to all users for installation with elevated privileges.
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1726:UsePreferredTerms", MessageId = "flags")]
+        public static void AdvertiseScript(string scriptFile, int flags, bool removeItems)
+        {
+            uint ret = NativeMethods.MsiAdvertiseScript(scriptFile, (uint) flags, IntPtr.Zero, removeItems);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Processes an advertise script file into the specified locations.
+        /// </summary>
+        /// <param name="scriptFile">Path to a script file generated by
+        /// <see cref="GenerateAdvertiseScript(string,string,string,int,ProcessorArchitecture,bool)"/></param>
+        /// <param name="iconFolder">An optional path to a folder in which advertised icon files and transform
+        /// files are located. If this parameter is null, no icon or transform files are written.</param>
+        /// <param name="shortcuts">True if shortcuts should be created</param>
+        /// <param name="removeItems">True if specified items are to be removed instead of created</param>
+        /// <remarks><p>
+        /// The process calling this function must be running under the LocalSystem account. To advertise an
+        /// application for per-user installation to a targeted user, the thread that calls this function must
+        /// impersonate the targeted user. If the thread calling this function is not impersonating a targeted
+        /// user, the application is advertised to all users for installation with elevated privileges.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiprocessadvertisescript.asp">MsiProcessAdvertiseScript</a>
+        /// </p></remarks>
+        public static void ProcessAdvertiseScript(string scriptFile, string iconFolder, bool shortcuts, bool removeItems)
+        {
+            uint ret = NativeMethods.MsiProcessAdvertiseScript(scriptFile, iconFolder, IntPtr.Zero, shortcuts, removeItems);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Gets product information for an installer script file.
+        /// </summary>
+        /// <param name="scriptFile">Path to a script file generated by
+        /// <see cref="GenerateAdvertiseScript(string,string,string,int,ProcessorArchitecture,bool)"/></param>
+        /// <returns>ProductInstallation stub with advertise-related properties filled in.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">An invalid product property was requested</exception>
+        /// <remarks><p>
+        /// Only the following properties will be filled in in the returned object:<ul>
+        /// <li><see cref="ProductInstallation.ProductCode"/></li>
+        /// <li><see cref="ProductInstallation.AdvertisedLanguage"/></li>
+        /// <li><see cref="ProductInstallation.AdvertisedVersion"/></li>
+        /// <li><see cref="ProductInstallation.AdvertisedProductName"/></li>
+        /// <li><see cref="ProductInstallation.AdvertisedPackageName"/></li>
+        /// </ul>Other properties will be null.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetproductinfofromscript.asp">MsiGetProductInfoFromScript</a>
+        /// </p></remarks>
+        public static ProductInstallation GetProductInfoFromScript(string scriptFile)
+        {
+            if (String.IsNullOrEmpty(scriptFile))
+            {
+                throw new ArgumentNullException("scriptFile");
+            }
+            StringBuilder productCodeBuf = new StringBuilder(40);
+            ushort lang;
+            uint ver;
+            StringBuilder productNameBuf = new StringBuilder(100);
+            StringBuilder packageNameBuf = new StringBuilder(40);
+            uint productCodeBufSize = (uint) productCodeBuf.Capacity;
+            uint productNameBufSize = (uint) productNameBuf.Capacity;
+            uint packageNameBufSize = (uint) packageNameBuf.Capacity;
+            uint ret = NativeMethods.MsiGetProductInfoFromScript(
+                scriptFile,
+                productCodeBuf,
+                out lang,
+                out ver,
+                productNameBuf,
+                ref productNameBufSize,
+                packageNameBuf,
+                ref packageNameBufSize);
+            if (ret == (uint) NativeMethods.Error.MORE_DATA)
+            {
+                productCodeBuf.Capacity = (int) ++productCodeBufSize;
+                productNameBuf.Capacity = (int) ++productNameBufSize;
+                packageNameBuf.Capacity = (int) ++packageNameBufSize;
+                ret = NativeMethods.MsiGetProductInfoFromScript(
+                    scriptFile,
+                    productCodeBuf,
+                    out lang,
+                    out ver,
+                    productNameBuf,
+                    ref productNameBufSize,
+                    packageNameBuf,
+                    ref packageNameBufSize);
+            }
+
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            uint verPart1 = ver >> 24;
+            uint verPart2 = (ver & 0x00FFFFFF) >> 16;
+            uint verPart3 = ver & 0x0000FFFF;
+            Version version = new Version((int) verPart1, (int) verPart2, (int) verPart3);
+
+            IDictionary<string, string> props = new Dictionary<string, string>();
+            props["ProductCode"] = productCodeBuf.ToString();
+            props["Language"] = lang.ToString(CultureInfo.InvariantCulture);
+            props["Version"] = version.ToString();
+            props["ProductName"] = productNameBuf.ToString();
+            props["PackageName"] = packageNameBuf.ToString();
+            return new ProductInstallation(props);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallerUtils.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallerUtils.cs
new file mode 100644
index 00000000..8d9cf0a1
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/InstallerUtils.cs
@@ -0,0 +1,472 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Resources;
+    using System.Reflection;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    public static partial class Installer
+    {
+        /// <summary>
+        /// Gets the current version of the installer.
+        /// </summary>
+        public static Version Version
+        {
+            get
+            {
+                // TODO: Use the extended form of version info to get the 4th component of the verison.
+                uint[] dllVersionInfo = new uint[5];
+                dllVersionInfo[0] = 20;
+                int hr = NativeMethods.DllGetVersion(dllVersionInfo);
+                if (hr != 0)
+                {
+                    Marshal.ThrowExceptionForHR(hr);
+                }
+                
+                return new Version((int) dllVersionInfo[1], (int) dllVersionInfo[2], (int) dllVersionInfo[3]);
+            }
+        }
+
+        internal static ResourceManager ErrorResources
+        {
+            get
+            {
+                if (errorResources == null)
+                {
+                    errorResources = new ResourceManager(typeof(Installer).Namespace + ".Errors", typeof(Installer).Assembly);
+                }
+                return errorResources;
+            }
+        }
+
+        /// <summary>
+        /// Gets a Windows Installer error message in the system default language.
+        /// </summary>
+        /// <param name="errorNumber">The error number.</param>
+        /// <returns>The message string, or null if the error message is not found.</returns>
+        /// <remarks><p>
+        /// The returned string may have tokens such as [2] and [3] that are meant to be substituted
+        /// with context-specific values.
+        /// </p><p>
+        /// Error numbers greater than 2000 refer to MSI "internal" errors, and are always
+        /// returned in English.
+        /// </p></remarks>
+        public static string GetErrorMessage(int errorNumber)
+        {
+            return Installer.GetErrorMessage(errorNumber, null);
+        }
+
+        /// <summary>
+        /// Gets a Windows Installer error message in a specified language.
+        /// </summary>
+        /// <param name="errorNumber">The error number.</param>
+        /// <param name="culture">The locale for the message.</param>
+        /// <returns>The message string, or null if the error message or locale is not found.</returns>
+        /// <remarks><p>
+        /// The returned string may have tokens such as [2] and [3] that are meant to be substituted
+        /// with context-specific values.
+        /// </p><p>
+        /// Error numbers greater than 2000 refer to MSI "internal" errors, and are always
+        /// returned in English.
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public static string GetErrorMessage(int errorNumber, CultureInfo culture)
+        {
+            if (culture == null)
+            {
+                culture = CultureInfo.CurrentCulture;
+            }
+
+            string msg = Installer.ErrorResources.GetString(
+                errorNumber.ToString(CultureInfo.InvariantCulture.NumberFormat),
+                culture);
+            if (msg == null)
+            {
+                string msiMsgModule = Path.Combine(
+                    Environment.SystemDirectory, "msimsg.dll");
+                msg = Installer.GetMessageFromModule(
+                    msiMsgModule, errorNumber, culture);
+            }
+            return msg;
+        }
+
+        private static string GetMessageFromModule(
+            string modulePath, int errorNumber, CultureInfo culture)
+        {
+            const uint LOAD_LIBRARY_AS_DATAFILE = 2;
+            const int RT_RCDATA = 10;
+
+            IntPtr msgModule = NativeMethods.LoadLibraryEx(
+                modulePath, IntPtr.Zero, LOAD_LIBRARY_AS_DATAFILE);
+            if (msgModule == IntPtr.Zero)
+            {
+                return null;
+            }
+
+            try
+            {
+                // On pre-Vista systems, the messages are stored as RCDATA resources.
+
+                int lcid = (culture == CultureInfo.InvariantCulture) ?
+                    0 : culture.LCID;
+                IntPtr resourceInfo = NativeMethods.FindResourceEx(
+                    msgModule,
+                    new IntPtr(RT_RCDATA),
+                    new IntPtr(errorNumber),
+                    (ushort) lcid);
+                if (resourceInfo != IntPtr.Zero)
+                {
+                    IntPtr resourceData = NativeMethods.LoadResource(
+                        msgModule, resourceInfo);
+                    IntPtr resourcePtr = NativeMethods.LockResource(resourceData);
+
+                    if (lcid == 0)
+                    {
+                        string msg = Marshal.PtrToStringAnsi(resourcePtr);
+                        return msg;
+                    }
+                    else
+                    {
+                        int len = 0;
+                        while (Marshal.ReadByte(resourcePtr, len) != 0)
+                        {
+                            len++;
+                        }
+                        byte[] msgBytes = new byte[len + 1];
+                        Marshal.Copy(resourcePtr, msgBytes, 0, msgBytes.Length);
+                        Encoding encoding = Encoding.GetEncoding(
+                            culture.TextInfo.ANSICodePage);
+                        string msg = encoding.GetString(msgBytes);
+                        return msg;
+                    }
+                }
+                else
+                {
+                    // On Vista (and above?), the messages are stored in the module message table.
+                    // They're actually in MUI files, and the redirection happens automatically here.
+
+                    const uint FORMAT_MESSAGE_IGNORE_INSERTS = 0x00000200;
+                    const uint FORMAT_MESSAGE_FROM_HMODULE   = 0x00000800;
+                    const uint MESSAGE_OFFSET = 20000; // Not documented, but observed on Vista
+
+                    StringBuilder buf = new StringBuilder(1024);
+                    uint formatCount = NativeMethods.FormatMessage(
+                        FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_IGNORE_INSERTS,
+                        msgModule,
+                        (uint) errorNumber + MESSAGE_OFFSET,
+                        (ushort) lcid,
+                        buf,
+                        (uint) buf.Capacity,
+                        IntPtr.Zero);
+
+                    return formatCount != 0 ? buf.ToString().Trim() : null;
+                }
+            }
+            finally
+            {
+                NativeMethods.FreeLibrary(msgModule);
+            }
+        }
+
+        /// <summary>
+        /// Gets a formatted Windows Installer error message in the system default language.
+        /// </summary>
+        /// <param name="errorRecord">Error record containing the error number in the first field, and
+        /// error-specific parameters in the other fields.</param>
+        /// <returns>The message string, or null if the error message is not found.</returns>
+        /// <remarks><p>
+        /// Error numbers greater than 2000 refer to MSI "internal" errors, and are always
+        /// returned in English.
+        /// </p></remarks>
+        public static string GetErrorMessage(Record errorRecord) { return Installer.GetErrorMessage(errorRecord, null); }
+
+        /// <summary>
+        /// Gets a formatted Windows Installer error message in a specified language.
+        /// </summary>
+        /// <param name="errorRecord">Error record containing the error number in the first field, and
+        /// error-specific parameters in the other fields.</param>
+        /// <param name="culture">The locale for the message.</param>
+        /// <returns>The message string, or null if the error message or locale is not found.</returns>
+        /// <remarks><p>
+        /// Error numbers greater than 2000 refer to MSI "internal" errors, and are always
+        /// returned in English.
+        /// </p></remarks>
+        public static string GetErrorMessage(Record errorRecord, CultureInfo culture)
+        {
+            if (errorRecord == null)
+            {
+                throw new ArgumentNullException("errorRecord");
+            }
+            int errorNumber;
+            if (errorRecord.FieldCount < 1 || (errorNumber = (int) errorRecord.GetInteger(1)) == 0)
+            {
+                throw new ArgumentOutOfRangeException("errorRecord");
+            }
+
+            string msg = Installer.GetErrorMessage(errorNumber, culture);
+            if (msg != null)
+            {
+                errorRecord.FormatString = msg;
+                msg = errorRecord.ToString((IFormatProvider)null);
+            }
+            return msg;
+        }
+
+        /// <summary>
+        /// Gets the version string of the path specified using the format that the installer
+        /// expects to find it in in the database.
+        /// </summary>
+        /// <param name="path">Path to the file</param>
+        /// <returns>Version string in the "#.#.#.#" format, or an empty string if the file
+        /// does not contain version information</returns>
+        /// <exception cref="FileNotFoundException">the file does not exist or could not be read</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfileversion.asp">MsiGetFileVersion</a>
+        /// </p></remarks>
+        public static string GetFileVersion(string path)
+        {
+            StringBuilder version = new StringBuilder(20);
+            uint verBufSize = 0, langBufSize = 0;
+            uint ret = NativeMethods.MsiGetFileVersion(path, version, ref verBufSize, null, ref langBufSize);
+            if (ret == (uint) NativeMethods.Error.MORE_DATA)
+            {
+                version.Capacity = (int) ++verBufSize;
+                ret = NativeMethods.MsiGetFileVersion(path, version, ref verBufSize, null, ref langBufSize);
+            }
+
+            if (ret != 0 && ret != (uint) NativeMethods.Error.FILE_INVALID)
+            {
+                if (ret == (uint) NativeMethods.Error.FILE_NOT_FOUND ||
+                   ret == (uint) NativeMethods.Error.ACCESS_DENIED)
+                {
+                    throw new FileNotFoundException(null, path);
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+            return version.ToString();
+        }
+
+        /// <summary>
+        /// Gets the language string of the path specified using the format that the installer
+        /// expects to find them in in the database.
+        /// </summary>
+        /// <param name="path">Path to the file</param>
+        /// <returns>Language string in the form of a decimal language ID, or an empty string if the file
+        /// does not contain a language ID</returns>
+        /// <exception cref="FileNotFoundException">the file does not exist or could not be read</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfileversion.asp">MsiGetFileVersion</a>
+        /// </p></remarks>
+        public static string GetFileLanguage(string path)
+        {
+            StringBuilder language = new StringBuilder("", 10);
+            uint verBufSize = 0, langBufSize = 0;
+            uint ret = NativeMethods.MsiGetFileVersion(path, null, ref verBufSize, language, ref langBufSize);
+            if (ret == (uint) NativeMethods.Error.MORE_DATA)
+            {
+                language.Capacity = (int) ++langBufSize;
+                ret = NativeMethods.MsiGetFileVersion(path, null, ref verBufSize, language, ref langBufSize);
+            }
+
+            if (ret != 0 && ret != (uint) NativeMethods.Error.FILE_INVALID)
+            {
+                if (ret == (uint) NativeMethods.Error.FILE_NOT_FOUND ||
+                    ret == (uint) NativeMethods.Error.ACCESS_DENIED)
+                {
+                    throw new FileNotFoundException(null, path);
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+            return language.ToString();
+        }
+
+        /// <summary>
+        /// Gets a 128-bit hash of the specified file.
+        /// </summary>
+        /// <param name="path">Path to the file</param>
+        /// <param name="hash">Integer array of length 4 which receives the
+        /// four 32-bit parts of the hash value.</param>
+        /// <exception cref="FileNotFoundException">the file does not exist or
+        /// could not be read</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetfilehash.asp">MsiGetFileHash</a>
+        /// </p></remarks>
+        public static void GetFileHash(string path, int[] hash)
+        {
+            if (hash == null)
+            {
+                throw new ArgumentNullException("hash");
+            }
+
+            uint[] tempHash = new uint[5];
+            tempHash[0] = 20;
+            uint ret = NativeMethods.MsiGetFileHash(path, 0, tempHash);
+            if (ret != 0)
+            {
+                if (ret == (uint) NativeMethods.Error.FILE_NOT_FOUND ||
+                    ret == (uint) NativeMethods.Error.ACCESS_DENIED)
+                {
+                    throw new FileNotFoundException(null, path);
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+
+            for (int i = 0; i < 4; i++)
+            {
+                hash[i] = unchecked ((int) tempHash[i + 1]);
+            }
+        }
+
+        /// <summary>
+        /// Examines a shortcut and returns its product, feature name, and component if available.
+        /// </summary>
+        /// <param name="shortcut">Full path to a shortcut</param>
+        /// <returns>ShortcutTarget structure containing target product code, feature, and component code</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetshortcuttarget.asp">MsiGetShortcutTarget</a>
+        /// </p></remarks>
+        public static ShortcutTarget GetShortcutTarget(string shortcut)
+        {
+            StringBuilder productBuf = new StringBuilder(40);
+            StringBuilder featureBuf = new StringBuilder(40);
+            StringBuilder componentBuf = new StringBuilder(40);
+
+            uint ret = NativeMethods.MsiGetShortcutTarget(shortcut, productBuf, featureBuf, componentBuf);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return new ShortcutTarget(
+                productBuf.Length > 0 ? productBuf.ToString() : null,
+                featureBuf.Length > 0 ? featureBuf.ToString() : null,
+                componentBuf.Length > 0 ? componentBuf.ToString() : null);
+        }
+
+        /// <summary>
+        /// Verifies that the given file is an installation package.
+        /// </summary>
+        /// <param name="packagePath">Path to the package</param>
+        /// <returns>True if the file is an installation package; false otherwise.</returns>
+        /// <exception cref="FileNotFoundException">the specified package file does not exist</exception>
+        /// <exception cref="InstallerException">the package file could not be opened</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiverifypackage.asp">MsiVerifyPackage</a>
+        /// </p></remarks>
+        public static bool VerifyPackage(string packagePath)
+        {
+            if (String.IsNullOrEmpty(packagePath))
+            {
+                throw new ArgumentNullException("packagePath");
+            }
+
+            if (!File.Exists(packagePath))
+            {
+                throw new FileNotFoundException(null, packagePath);
+            }
+
+            uint ret = NativeMethods.MsiVerifyPackage(packagePath);
+            if (ret == (uint) NativeMethods.Error.INSTALL_PACKAGE_INVALID)
+            {
+                return false;
+            }
+            else if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// [MSI 4.0] Gets the list of files that can be updated by one or more patches.
+        /// </summary>
+        /// <param name="productCode">ProductCode (GUID) of the product which is
+        /// the target of the patches</param>
+        /// <param name="patches">list of file paths of one or more patches to be
+        /// analyzed</param>
+        /// <returns>List of absolute paths of files that can be updated when the
+        /// patches are applied on this system.</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetpatchfilelist.asp">MsiGetPatchFileList</a>
+        /// </p></remarks>
+        public static IList<string> GetPatchFileList(string productCode, IList<string> patches)
+        {
+            if (String.IsNullOrEmpty(productCode))
+            {
+                throw new ArgumentNullException("productCode");
+            }
+
+            if (patches == null || patches.Count == 0)
+            {
+                throw new ArgumentNullException("patches");
+            }
+
+            StringBuilder patchList = new StringBuilder();
+            foreach (string patch in patches)
+            {
+                if (patch != null)
+                {
+                    if (patchList.Length != 0)
+                    {
+                        patchList.Append(';');
+                    }
+
+                    patchList.Append(patch);
+                }
+            }
+
+            if (patchList.Length == 0)
+            {
+                throw new ArgumentNullException("patches");
+            }
+
+            IntPtr phFileRecords;
+            uint cFiles;
+
+            uint ret = NativeMethods.MsiGetPatchFileList(
+                productCode,
+                patchList.ToString(),
+                out cFiles,
+                out phFileRecords);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+
+            List<string> files = new List<string>();
+
+            for (uint i = 0; i < cFiles; i++)
+            {
+                int hFileRec = Marshal.ReadInt32(phFileRecords, (int) i);
+
+                using (Record fileRec = new Record(hFileRec, true, null))
+                {
+                    files.Add(fileRec.GetString(1));
+                }
+            }
+
+            return files;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/MediaDisk.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/MediaDisk.cs
new file mode 100644
index 00000000..7b196b3e
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/MediaDisk.cs
@@ -0,0 +1,58 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Represents a media disk source of a product or a patch.
+    /// </summary>
+    [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes")]
+    public struct MediaDisk
+    {
+        private int diskId;
+        private string volumeLabel;
+        private string diskPrompt;
+
+        /// <summary>
+        /// Creates a new media disk.
+        /// </summary>
+        /// <param name="diskId"></param>
+        /// <param name="volumeLabel"></param>
+        /// <param name="diskPrompt"></param>
+        public MediaDisk(int diskId, string volumeLabel, string diskPrompt)
+        {
+            this.diskId = diskId;
+            this.volumeLabel = volumeLabel;
+            this.diskPrompt = diskPrompt;
+        }
+
+        /// <summary>
+        /// Gets or sets the disk id of the media disk.
+        /// </summary>
+        public int DiskId
+        {
+            get { return this.diskId; }
+            set { this.diskId = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the volume label of the media disk.
+        /// </summary>
+        public string VolumeLabel
+        {
+            get { return this.volumeLabel; }
+            set { this.volumeLabel = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the disk prompt of the media disk.
+        /// </summary>
+        public string DiskPrompt
+        {
+            get { return this.diskPrompt; }
+            set { this.diskPrompt = value; }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/NativeMethods.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/NativeMethods.cs
new file mode 100644
index 00000000..a438b640
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/NativeMethods.cs
@@ -0,0 +1,309 @@
+// 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.Dtf.WindowsInstaller
+{
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Diagnostics.CodeAnalysis;
+
+using IStream  = System.Runtime.InteropServices.ComTypes.IStream;
+using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
+using STATSTG  = System.Runtime.InteropServices.ComTypes.STATSTG;
+
+[Guid("0000000b-0000-0000-C000-000000000046")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+internal interface IStorage
+{
+    [return: MarshalAs(UnmanagedType.Interface)]
+    IStream CreateStream([MarshalAs(UnmanagedType.LPWStr)] string wcsName, uint grfMode, uint reserved1, uint reserved2);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    IStream OpenStream([MarshalAs(UnmanagedType.LPWStr)] string wcsName, IntPtr reserved1, uint grfMode, uint reserved2);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    IStorage CreateStorage([MarshalAs(UnmanagedType.LPWStr)] string wcsName, uint grfMode, uint reserved1, uint reserved2);
+    [return: MarshalAs(UnmanagedType.Interface)]
+    IStorage OpenStorage([MarshalAs(UnmanagedType.LPWStr)] string wcsName, IntPtr stgPriority, uint grfMode, IntPtr snbExclude, uint reserved);
+    void CopyTo(uint ciidExclude, IntPtr rgiidExclude, IntPtr snbExclude, [MarshalAs(UnmanagedType.Interface)] IStorage stgDest);
+    void MoveElementTo([MarshalAs(UnmanagedType.LPWStr)] string wcsName, [MarshalAs(UnmanagedType.Interface)] IStorage stgDest, [MarshalAs(UnmanagedType.LPWStr)] string wcsNewName, uint grfFlags);
+    void Commit(uint grfCommitFlags);
+    void Revert();
+    IntPtr EnumElements(uint reserved1, IntPtr reserved2, uint reserved3);
+    void DestroyElement([MarshalAs(UnmanagedType.LPWStr)] string wcsName);
+    void RenameElement([MarshalAs(UnmanagedType.LPWStr)] string wcsOldName, [MarshalAs(UnmanagedType.LPWStr)] string wcsNewName);
+    void SetElementTimes([MarshalAs(UnmanagedType.LPWStr)] string wcsName, ref FILETIME ctime, ref FILETIME atime, ref FILETIME mtime);
+    void SetClass(ref Guid clsid);
+    void SetStateBits(uint grfStateBits, uint grfMask);
+    void Stat(ref STATSTG statstg, uint grfStatFlag);
+}
+
+internal static class NativeMethods
+{
+    internal enum Error : uint
+    {
+        SUCCESS = 0,
+        FILE_NOT_FOUND = 2,
+        PATH_NOT_FOUND = 3,
+        ACCESS_DENIED = 5,
+        INVALID_HANDLE = 6,
+        INVALID_DATA = 13,
+        INVALID_PARAMETER = 87,
+        OPEN_FAILED = 110,
+        DISK_FULL = 112,
+        CALL_NOT_IMPLEMENTED = 120,
+        BAD_PATHNAME = 161,
+        NO_DATA = 232,
+        MORE_DATA = 234,
+        NO_MORE_ITEMS = 259,
+        DIRECTORY = 267,
+        INSTALL_USEREXIT = 1602,
+        INSTALL_FAILURE = 1603,
+        FILE_INVALID = 1006,
+        UNKNOWN_PRODUCT = 1605,
+        UNKNOWN_FEATURE = 1606,
+        UNKNOWN_COMPONENT = 1607,
+        UNKNOWN_PROPERTY = 1608,
+        INVALID_HANDLE_STATE = 1609,
+        INSTALL_SOURCE_ABSENT = 1612,
+        BAD_QUERY_SYNTAX = 1615,
+        INSTALL_PACKAGE_INVALID = 1620,
+        FUNCTION_FAILED = 1627,
+        INVALID_TABLE = 1628,
+        DATATYPE_MISMATCH = 1629,
+        CREATE_FAILED = 1631,
+        SUCCESS_REBOOT_INITIATED = 1641,
+        SUCCESS_REBOOT_REQUIRED = 3010,
+    }
+
+    internal enum SourceType : int
+    {
+        Unknown = 0,
+        Network = 1,
+        Url = 2,
+        Media = 3,
+    }
+
+    [Flags]
+    internal enum STGM : uint
+    {
+        DIRECT           = 0x00000000,
+        TRANSACTED       = 0x00010000,
+        SIMPLE           = 0x08000000,
+
+        READ             = 0x00000000,
+        WRITE            = 0x00000001,
+        READWRITE        = 0x00000002,
+
+        SHARE_DENY_NONE  = 0x00000040,
+        SHARE_DENY_READ  = 0x00000030,
+        SHARE_DENY_WRITE = 0x00000020,
+        SHARE_EXCLUSIVE  = 0x00000010,
+
+        PRIORITY         = 0x00040000,
+        DELETEONRELEASE  = 0x04000000,
+        NOSCRATCH        = 0x00100000,
+
+        CREATE           = 0x00001000,
+        CONVERT          = 0x00020000,
+        FAILIFTHERE      = 0x00000000,
+
+        NOSNAPSHOT       = 0x00200000,
+        DIRECT_SWMR      = 0x00400000,
+    }
+
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int DllGetVersion(uint[] dvi);
+
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSetInternalUI(uint dwUILevel, ref IntPtr phWnd);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSetInternalUI(uint dwUILevel, IntPtr phWnd);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern NativeExternalUIHandler MsiSetExternalUI([MarshalAs(UnmanagedType.FunctionPtr)] NativeExternalUIHandler puiHandler, uint dwMessageFilter, IntPtr pvContext); 
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnableLog(uint dwLogMode, string szLogFile, uint dwLogAttributes);
+//[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumProducts(uint iProductIndex, StringBuilder lpProductBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetProductInfo(string szProduct, string szProperty, StringBuilder lpValueBuf, ref uint pcchValueBuf);
+//[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumPatches(string szProduct, uint iPatchIndex, StringBuilder lpPatchBuf, StringBuilder lpTransformsBuf, ref uint pcchTransformsBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetPatchInfo(string szPatch, string szAttribute, StringBuilder lpValueBuf, ref uint pcchValueBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumFeatures(string szProduct, uint iFeatureIndex, StringBuilder lpFeatureBuf, StringBuilder lpParentBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiQueryFeatureState(string szProduct, string szFeature);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiUseFeatureEx(string szProduct, string szFeature, uint dwInstallMode, uint dwReserved);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiQueryProductState(string szProduct);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetShortcutTarget(string szShortcut, StringBuilder szProductCode, StringBuilder szFeatureId, StringBuilder szComponentCode);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiProvideComponent(string szProduct, string szFeature, string szComponent, uint dwInstallMode, StringBuilder lpPathBuf, ref uint cchPathBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiProvideQualifiedComponentEx(string szComponent, string szQualifier, uint dwInstallMode, string szProduct, uint dwUnused1, uint dwUnused2, StringBuilder lpPathBuf, ref uint cchPathBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiReinstallFeature(string szFeature, string szProduct, uint dwReinstallMode);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiReinstallProduct(string szProduct, uint dwReinstallMode);
+//[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListAddSource(string szProduct, string szUserName, uint dwReserved, string szSource);
+//[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListClearAll(string szProduct, string szUserName, uint dwReserved);
+//[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListForceResolution(string szProduct, string szUserName, uint dwReserved);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiCollectUserInfo(string szProduct);
+//[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int  MsiGetUserInfo(string szProduct, StringBuilder lpUserNameBuf, ref uint cchUserNameBuf, StringBuilder lpOrgNameBuf, ref uint cchOrgNameBuf, StringBuilder lpSerialBuf, ref uint cchSerialBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiOpenPackageEx(string szPackagePath, uint dwOptions, out int hProduct);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiOpenProduct(string szProduct, out int hProduct);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiInstallProduct(string szPackagePath, string szCommandLine);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiConfigureProductEx(string szProduct, int iInstallLevel, int eInstallState, string szCommandLine);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiConfigureFeature(string szProduct, string szFeature, int eInstallState);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiApplyPatch(string szPatchPackage, string szInstallPackage, int eInstallType, string szCommandLine);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiOpenDatabase(string szDatabasePath, IntPtr uiOpenMode, out int hDatabase);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiOpenDatabase(string szDatabasePath, string szPersist, out int hDatabase);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiGetDatabaseState(int hDatabase);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDatabaseOpenView(int hDatabase, string szQuery, out int hView);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDatabaseMerge(int hDatabase, int hDatabaseMerge, string szTableName);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDatabaseCommit(int hDatabase);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDatabaseGetPrimaryKeys(int hDatabase, string szTableName, out int hRecord);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDatabaseIsTablePersistent(int hDatabase, string szTableName);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDatabaseExport(int hDatabase, string szTableName, string szFolderPath, string szFileName);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDatabaseImport(int hDatabase, string szFolderPath, string szFileName);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDatabaseGenerateTransform(int hDatabase, int hDatabaseReference, string szTransformFile, int iReserved1, int iReserved2);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiCreateTransformSummaryInfo(int hDatabase, int hDatabaseReference, string szTransformFile, int iErrorConditions, int iValidation);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDatabaseApplyTransform(int hDatabase, string szTransformFile, int iErrorConditions);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiViewExecute(int hView, int hRecord);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiViewFetch(int hView, out int hRecord);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiViewModify(int hView, int iModifyMode, int hRecord);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiViewGetError(int hView, StringBuilder szColumnNameBuffer, ref uint cchBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiViewGetColumnInfo(int hView, uint eColumnInfo, out int hRecord);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiCreateRecord(uint cParams);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiFormatRecord(int hInstall, int hRecord, StringBuilder szResultBuf, ref uint cchResultBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiRecordClearData(int hRecord);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiRecordGetFieldCount(int hRecord);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool MsiRecordIsNull(int hRecord, uint iField);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiRecordGetInteger(int hRecord, uint iField);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiRecordGetString(int hRecord, uint iField, StringBuilder szValueBuf, ref uint cchValueBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiRecordSetInteger(int hRecord, uint iField, int iValue);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiRecordSetString(int hRecord, uint iField, string szValue);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiRecordDataSize(int hRecord, uint iField);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiRecordReadStream(int hRecord, uint iField, byte[] szDataBuf, ref uint cbDataBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiRecordSetStream(int hRecord, uint iField, string szFilePath);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetSummaryInformation(int hDatabase, string szDatabasePath, uint uiUpdateCount, out int hSummaryInfo);
+//[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSummaryInfoGetPropertyCount(int hSummaryInfo, out uint uiPropertyCount);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSummaryInfoGetProperty(int hSummaryInfo, uint uiProperty, out uint uiDataType, out int iValue, ref long ftValue, StringBuilder szValueBuf, ref uint cchValueBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSummaryInfoSetProperty(int hSummaryInfo, uint uiProperty, uint uiDataType, int iValue, ref long ftValue, string szValue);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSummaryInfoPersist(int hSummaryInfo);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiCloseHandle(int hAny);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetFileVersion(string szFilePath, StringBuilder szVersionBuf, ref uint cchVersionBuf, StringBuilder szLangBuf, ref uint cchLangBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetFileHash(string szFilePath, uint dwOptions, uint[] hash);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiGetActiveDatabase(int hInstall);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetProperty(int hInstall, string szName, StringBuilder szValueBuf, ref uint cchValueBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSetProperty(int hInstall, string szName, string szValue);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiProcessMessage(int hInstall, uint eMessageType, int hRecord);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEvaluateCondition(int hInstall, string szCondition);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool MsiGetMode(int hInstall, uint iRunMode);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSetMode(int hInstall, uint iRunMode, [MarshalAs(UnmanagedType.Bool)] bool fState);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDoAction(int hInstall, string szAction);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSequence(int hInstall, string szTable, int iSequenceMode);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetSourcePath(int hInstall, string szFolder, StringBuilder szPathBuf, ref uint cchPathBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetTargetPath(int hInstall, string szFolder, StringBuilder szPathBuf, ref uint cchPathBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSetTargetPath(int hInstall, string szFolder, string szFolderPath);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetComponentState(int hInstall, string szComponent, out int iInstalled, out int iAction);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSetComponentState(int hInstall, string szComponent, int iState);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetFeatureState(int hInstall, string szFeature, out int iInstalled, out int iAction);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSetFeatureState(int hInstall, string szFeature, int iState);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetFeatureValidStates(int hInstall, string szFeature, out uint dwInstallState);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSetInstallLevel(int hInstall, int iInstallLevel);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern ushort MsiGetLanguage(int hInstall);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumComponents(uint iComponentIndex, StringBuilder lpComponentBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumComponentsEx(string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwIndex, StringBuilder szInstalledProductCode, [MarshalAs(UnmanagedType.I4)] out UserContexts pdwInstalledContext, StringBuilder szSid, ref uint pcchSid);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumClients(string szComponent, uint iProductIndex, StringBuilder lpProductBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumClientsEx(string szComponent, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint iProductIndex, StringBuilder lpProductBuf, [MarshalAs(UnmanagedType.I4)] out UserContexts pdwInstalledContext, StringBuilder szSid, ref uint pcchSid);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiGetComponentPath(string szProduct, string szComponent, StringBuilder lpPathBuf, ref uint pcchBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiGetComponentPathEx(string szProduct, string szComponent, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, StringBuilder lpPathBuf, ref uint pcchBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumComponentQualifiers(string szComponent, uint iIndex, StringBuilder lpQualifierBuf, ref uint pcchQualifierBuf, StringBuilder lpApplicationDataBuf, ref uint pcchApplicationDataBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiGetLastErrorRecord();
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumRelatedProducts(string upgradeCode, uint dwReserved, uint iProductIndex, StringBuilder lpProductBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetProductCode(string szComponent, StringBuilder lpProductBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetFeatureUsage(string szProduct, string szFeature, out uint dwUseCount, out ushort dwDateUsed);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetFeatureCost(int hInstall, string szFeature, int iCostTree, int iState, out int iCost);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiVerifyPackage(string szPackagePath);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiIsProductElevated(string szProductCode, [MarshalAs(UnmanagedType.Bool)] out bool fElevated);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiAdvertiseProduct(string szPackagePath, IntPtr szScriptFilePath, string szTransforms, ushort lgidLanguage);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiAdvertiseProduct(string szPackagePath, string szScriptFilePath, string szTransforms, ushort lgidLanguage);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiAdvertiseProductEx(string szPackagePath, string szScriptFilePath, string szTransforms, ushort lgidLanguage, uint dwPlatform, uint dwReserved);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiAdvertiseScript(string szScriptFile, uint dwFlags, IntPtr phRegData, [MarshalAs(UnmanagedType.Bool)] bool fRemoveItems);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiProcessAdvertiseScript(string szScriptFile, string szIconFolder, IntPtr hRegData, [MarshalAs(UnmanagedType.Bool)] bool fShortcuts, [MarshalAs(UnmanagedType.Bool)] bool fRemoveItems);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetProductInfoFromScript(string szScriptFile, StringBuilder lpProductBuf39, out ushort plgidLanguage, out uint pdwVersion, StringBuilder lpNameBuf, ref uint cchNameBuf, StringBuilder lpPackageBuf, ref uint cchPackageBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiProvideAssembly(string szAssemblyName, string szAppContext, uint dwInstallMode, uint dwAssemblyInfo, StringBuilder lpPathBuf, ref uint cchPathBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiInstallMissingComponent(string szProduct, string szComponent, int eInstallState);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiInstallMissingFile(string szProduct, string szFile);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern int MsiLocateComponent(string szComponent, StringBuilder lpPathBuf, ref uint cchBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetProductProperty(int hProduct, string szProperty, StringBuilder lpValueBuf, ref uint cchValueBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetFeatureInfo(int hProduct, string szFeature, out uint lpAttributes, StringBuilder lpTitleBuf, ref uint cchTitleBuf, StringBuilder lpHelpBuf, ref uint cchHelpBuf);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiVerifyDiskSpace(int hInstall);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumComponentCosts(int hInstall, string szComponent, uint dwIndex, int iState, StringBuilder lpDriveBuf, ref uint cchDriveBuf, out int iCost, out int iTempCost);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSetFeatureAttributes(int hInstall, string szFeature, uint dwAttributes);
+
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiRemovePatches(string szPatchList, string szProductCode, int eUninstallType, string szPropertyList);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDetermineApplicablePatches(string szProductPackagePath, uint cPatchInfo, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex=1), In, Out] MsiPatchSequenceData[] pPatchInfo);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiDeterminePatchSequence(string szProductCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint cPatchInfo, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex=3), In, Out] MsiPatchSequenceData[] pPatchInfo);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiApplyMultiplePatches(string szPatchPackages, string szProductCode, string szPropertiesList);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumPatchesEx(string szProductCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwFilter, uint dwIndex, StringBuilder szPatchCode, StringBuilder szTargetProductCode, [MarshalAs(UnmanagedType.I4)] out UserContexts pdwTargetProductContext, StringBuilder szTargetUserSid, ref uint pcchTargetUserSid);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetPatchInfoEx(string szPatchCode, string szProductCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, string szProperty, StringBuilder lpValue, ref uint pcchValue);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEnumProductsEx(string szProductCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwIndex, StringBuilder szInstalledProductCode, [MarshalAs(UnmanagedType.I4)] out UserContexts pdwInstalledContext, StringBuilder szSid, ref uint pcchSid);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetProductInfoEx(string szProductCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, string szProperty, StringBuilder lpValue, ref uint pcchValue);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiQueryFeatureStateEx(string szProductCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, string szFeature, out int pdwState);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiQueryComponentState(string szProductCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, string szComponent, out int pdwState);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiExtractPatchXMLData(string szPatchPath, uint dwReserved, StringBuilder szXMLData, ref uint pcchXMLData);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListEnumSources(string szProductCodeOrPatchCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwOptions, uint dwIndex, StringBuilder szSource, ref uint pcchSource);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListAddSourceEx(string szProductCodeOrPatchCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwOptions, string szSource, uint dwIndex);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListClearSource(string szProductCodeOrPatchCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwOptions, string szSource);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListClearAllEx(string szProductCodeOrPatchCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwOptions);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListForceResolutionEx(string szProductCodeOrPatchCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwOptions);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListGetInfo(string szProductCodeOrPatchCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwOptions, string szProperty, StringBuilder szValue, ref uint pcchValue);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListSetInfo(string szProductCodeOrPatchCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwOptions, string szProperty, string szValue);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListEnumMediaDisks(string szProductCodeOrPatchCode, string szUserSID, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwOptions, uint dwIndex, out uint pdwDiskId, StringBuilder szVolumeLabel, ref uint pcchVolumeLabel, StringBuilder szDiskPrompt, ref uint pcchDiskPrompt);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListAddMediaDisk(string szProductCodeOrPatchCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwOptions, uint dwDiskId, string szVolumeLabel, string szDiskPrompt);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSourceListClearMediaDisk(string szProductCodeOrPatchCode, string szUserSid, [MarshalAs(UnmanagedType.I4)] UserContexts dwContext, uint dwOptions, uint dwDiskID);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiNotifySidChange(string szOldSid, string szNewSid);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiSetExternalUIRecord([MarshalAs(UnmanagedType.FunctionPtr)] NativeExternalUIRecordHandler puiHandler, uint dwMessageFilter, IntPtr pvContext, out NativeExternalUIRecordHandler ppuiPrevHandler);
+
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiGetPatchFileList(string szProductCode, string szPatchList, out uint cFiles, out IntPtr phFileRecords);
+
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiBeginTransaction(string szTransactionName, int dwTransactionAttributes, out int hTransaction, out IntPtr phChangeOfOwnerEvent);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiEndTransaction(int dwTransactionState);
+[DllImport("msi.dll", CharSet=CharSet.Unicode)] internal static extern uint MsiJoinTransaction(int hTransaction, int dwTransactionAttributes, out IntPtr phChangeOfOwnerEvent);
+
+[DllImport("kernel32.dll", SetLastError=true, CharSet=CharSet.Unicode, EntryPoint="LoadLibraryExW")] internal static extern IntPtr LoadLibraryEx(string fileName, IntPtr hFile, uint flags);
+[DllImport("kernel32.dll", SetLastError=true)] [return: MarshalAs(UnmanagedType.Bool)] internal static extern bool FreeLibrary(IntPtr hModule);
+[DllImport("kernel32.dll", SetLastError=true)] internal static extern IntPtr FindResourceEx(IntPtr hModule, IntPtr type, IntPtr name, ushort langId);
+[DllImport("kernel32.dll", SetLastError=true)] internal static extern IntPtr LoadResource(IntPtr hModule, IntPtr lpResourceInfo);
+[DllImport("kernel32.dll", SetLastError=true)] internal static extern IntPtr LockResource(IntPtr resourceData);
+[DllImport("kernel32.dll", SetLastError=true, CharSet=CharSet.Unicode, EntryPoint="FormatMessageW")] internal static extern uint FormatMessage(uint dwFlags, IntPtr lpSource, uint dwMessageId, uint dwLanguageId, StringBuilder lpBuffer, uint nSize, IntPtr Arguments);
+[DllImport("kernel32.dll", SetLastError=true)] internal static extern int WaitForSingleObject(IntPtr handle, int milliseconds);
+
+[DllImport("ole32.dll")] internal static extern int StgOpenStorage([MarshalAs(UnmanagedType.LPWStr)] string wcsName, IntPtr stgPriority, uint grfMode, IntPtr snbExclude, uint reserved, [MarshalAs(UnmanagedType.Interface)] out IStorage stgOpen);
+[DllImport("ole32.dll")] internal static extern int StgCreateDocfile([MarshalAs(UnmanagedType.LPWStr)] string wcsName, uint grfMode, uint reserved, [MarshalAs(UnmanagedType.Interface)] out IStorage stgOpen);
+
+[DllImport("user32.dll", CharSet=CharSet.Unicode, EntryPoint="MessageBoxW")] internal static extern MessageResult MessageBox(IntPtr hWnd, string lpText, string lpCaption, [MarshalAs(UnmanagedType.U4)] int uType);
+
+    [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]
+    internal struct MsiPatchSequenceData
+    {
+        public string szPatchData;
+        public int ePatchDataType;
+        public int dwOrder;
+        public uint dwStatus;
+    }
+
+    internal class MsiHandle : SafeHandle
+    {
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public MsiHandle(IntPtr handle, bool ownsHandle)
+            : base(handle, ownsHandle)
+        {
+        }
+
+        public override bool IsInvalid
+        {
+            get
+            {
+                return this.handle == IntPtr.Zero;
+            }
+        }
+
+        public static implicit operator IntPtr(MsiHandle msiHandle)
+        {
+            return msiHandle.handle;
+        }
+
+        protected override bool ReleaseHandle()
+        {
+            return RemotableNativeMethods.MsiCloseHandle((int) this.handle) == 0;
+        }
+    }
+}
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/PatchInstallation.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/PatchInstallation.cs
new file mode 100644
index 00000000..defbf64a
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/PatchInstallation.cs
@@ -0,0 +1,413 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// The Patch object represents a unique instance of a patch that has been
+    /// registered or applied.
+    /// </summary>
+    public class PatchInstallation : Installation
+    {
+        /// <summary>
+        /// Enumerates all patch installations on the system.
+        /// </summary>
+        /// <returns>Enumeration of patch objects.</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumpatches.asp">MsiEnumPatches</a>
+        /// </p></remarks>
+        public static IEnumerable<PatchInstallation> AllPatches
+        {
+            get
+            {
+                return PatchInstallation.GetPatches(null, null, null, UserContexts.All, PatchStates.All);
+            }
+        }
+
+        /// <summary>
+        /// Enumerates patch installations based on certain criteria.
+        /// </summary>
+        /// <param name="patchCode">PatchCode (GUID) of the patch to be enumerated. Only
+        /// instances of patches within the scope of the context specified by the
+        /// <paramref name="userSid"/> and <paramref name="context"/> parameters will be
+        /// enumerated. This parameter may be set to null to enumerate all patches in the specified
+        /// context.</param>
+        /// <param name="targetProductCode">ProductCode (GUID) product whose patches are to be
+        /// enumerated. If non-null, patch enumeration is restricted to instances of this product
+        /// within the specified context. If null, the patches for all products under the specified
+        /// context are enumerated.</param>
+        /// <param name="userSid">Specifies a security identifier (SID) that restricts the context
+        /// of enumeration. A SID value other than s-1-1-0 is considered a user SID and restricts
+        /// enumeration to the current user or any user in the system. The special SID string
+        /// s-1-1-0 (Everyone) specifies enumeration across all users in the system. This parameter
+        /// can be set to null to restrict the enumeration scope to the current user. When
+        /// <paramref name="userSid"/> must be null.</param>
+        /// <param name="context">Specifies the user context.</param>
+        /// <param name="states">The <see cref="PatchStates"/> of patches to return.</param>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumpatchesex.asp">MsiEnumPatchesEx</a>
+        /// </p></remarks>
+        public static IEnumerable<PatchInstallation> GetPatches(
+            string patchCode,
+            string targetProductCode,
+            string userSid,
+            UserContexts context,
+            PatchStates states)
+        {
+            StringBuilder buf = new StringBuilder(40);
+            StringBuilder targetProductBuf = new StringBuilder(40);
+            UserContexts targetContext;
+            StringBuilder targetSidBuf = new StringBuilder(40);
+            for (uint i = 0; ; i++)
+            {
+                uint targetSidBufSize = (uint) targetSidBuf.Capacity;
+                uint ret = NativeMethods.MsiEnumPatchesEx(
+                    targetProductCode,
+                    userSid,
+                    context,
+                    (uint) states,
+                    i,
+                    buf,
+                    targetProductBuf,
+                    out targetContext,
+                    targetSidBuf,
+                    ref targetSidBufSize);
+                if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                {
+                    targetSidBuf.Capacity = (int) ++targetSidBufSize;
+                    ret = NativeMethods.MsiEnumPatchesEx(
+                        targetProductCode,
+                        userSid,
+                        context,
+                        (uint) states,
+                        i,
+                        buf,
+                        targetProductBuf,
+                        out targetContext,
+                        targetSidBuf,
+                        ref targetSidBufSize);
+                }
+
+                if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS)
+                {
+                    break;
+                }
+
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+
+                string thisPatchCode = buf.ToString();
+                if (patchCode == null || patchCode == thisPatchCode)
+                {
+                    yield return new PatchInstallation(
+                        buf.ToString(),
+                        targetProductBuf.ToString(),
+                        targetSidBuf.ToString(),
+                        targetContext);
+                }
+            }
+        }
+
+        private string productCode;
+
+        /// <summary>
+        /// Creates a new object for accessing information about a patch installation on the current system.
+        /// </summary>
+        /// <param name="patchCode">Patch code (GUID) of the patch.</param>
+        /// <param name="productCode">ProductCode (GUID) the patch has been applied to.
+        /// This parameter may be null for patches that are registered only and not yet
+        /// applied to any product.</param>
+        /// <remarks><p>
+        /// All available user contexts will be queried.
+        /// </p></remarks>
+        public PatchInstallation(string patchCode, string productCode)
+            : this(patchCode, productCode, null, UserContexts.All)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new object for accessing information about a patch installation on the current system.
+        /// </summary>
+        /// <param name="patchCode">Registered patch code (GUID) of the patch.</param>
+        /// <param name="productCode">ProductCode (GUID) the patch has been applied to.
+        /// This parameter may be null for patches that are registered only and not yet
+        /// applied to any product.</param>
+        /// <param name="userSid">The specific user, when working in a user context.  This
+        /// parameter may be null to indicate the current user.  The parameter must be null
+        /// when working in a machine context.</param>
+        /// <param name="context">The user context. The calling process must have administrative
+        /// privileges to get information for a product installed for a user other than the
+        /// current user.</param>
+        /// <remarks><p>
+        /// If the <paramref name="productCode"/> is null, the Patch object may
+        /// only be used to read and update the patch's SourceList information.
+        /// </p></remarks>
+        public PatchInstallation(string patchCode, string productCode, string userSid, UserContexts context)
+            : base(patchCode, userSid, context)
+        {
+            if (String.IsNullOrEmpty(patchCode))
+            {
+                throw new ArgumentNullException("patchCode");
+            }
+
+            this.productCode = productCode;
+        }
+
+        /// <summary>
+        /// Gets the patch code (GUID) of the patch.
+        /// </summary>
+        public string PatchCode
+        {
+            get
+            {
+                return this.InstallationCode;
+            }
+        }
+
+        /// <summary>
+        /// Gets the ProductCode (GUID) of the product.
+        /// </summary>
+        public string ProductCode
+        {
+            get
+            {
+                return this.productCode;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this patch is currently installed.
+        /// </summary>
+        public override bool IsInstalled
+        {
+            get
+            {
+                return (this.State & PatchStates.Applied) != 0;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this patch is marked as obsolte.
+        /// </summary>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Obsoleted")]
+        public bool IsObsoleted
+        {
+            get
+            {
+                return (this.State & PatchStates.Obsoleted) != 0;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this patch is present but has been
+        /// superseded by a more recent installed patch.
+        /// </summary>
+        public bool IsSuperseded
+        {
+            get
+            {
+                return (this.State & PatchStates.Superseded) != 0;
+            }
+        }
+
+        internal override int InstallationType
+        {
+            get
+            {
+                const int MSICODE_PATCH = 0x40000000;
+                return MSICODE_PATCH;
+            }
+        }
+
+        /// <summary>
+        /// Gets the installation state of this instance of the patch.
+        /// </summary>
+        /// <exception cref="ArgumentException">An unknown patch was requested</exception>
+        /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+        public PatchStates State
+        {
+            get
+            {
+                string stateString = this["State"];
+                return (PatchStates) Int32.Parse(stateString, CultureInfo.InvariantCulture.NumberFormat);
+            }
+        }
+
+        /// <summary>
+        /// Gets the cached patch file that the product uses.
+        /// </summary>
+        public string LocalPackage
+        {
+            get
+            {
+                return this["LocalPackage"];
+            }
+        }
+
+        /// <summary>
+        /// Gets the set of patch transforms that the last patch
+        /// installation applied to the product.
+        /// </summary>
+        /// <remarks><p>
+        /// This value may not be available for per-user, non-managed applications
+        /// if the user is not logged on.
+        /// </p></remarks>
+        public string Transforms
+        {
+            get
+            {
+                // TODO: convert to IList<string>?
+                return this["Transforms"];
+            }
+        }
+
+        /// <summary>
+        /// Gets the date and time when the patch is applied to the product.
+        /// </summary>
+        public DateTime InstallDate
+        {
+            get
+            {
+                try
+                {
+                    return DateTime.ParseExact(
+                        this["InstallDate"], "yyyyMMdd", CultureInfo.InvariantCulture);
+                }
+                catch (FormatException)
+                {
+                    return DateTime.MinValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// True patch is marked as possible to uninstall from the product.
+        /// </summary>
+        /// <remarks><p>
+        /// Even if this property is true, the installer can still block the
+        /// uninstallation if this patch is required by another patch that
+        /// cannot be uninstalled.
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Uninstallable")]
+        public bool Uninstallable
+        {
+            get
+            {
+                return this["Uninstallable"] == "1";
+            }
+        }
+
+        /// <summary>
+        /// Get the registered display name for the patch.
+        /// </summary>
+        public string DisplayName
+        {
+            get
+            {
+                return this["DisplayName"];
+            }
+        }
+
+        /// <summary>
+        /// Gets the registered support information URL for the patch.
+        /// </summary>
+        public Uri MoreInfoUrl
+        {
+            get
+            {
+                string value = this["MoreInfoURL"];
+                if (!String.IsNullOrEmpty(value))
+                {
+                    try
+                    {
+                        return new Uri(value);
+                    }
+                    catch (UriFormatException) { }
+                }
+
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets information about a specific patch installation. 
+        /// </summary>
+        /// <param name="propertyName">The property being retrieved; see remarks for valid properties.</param>
+        /// <returns>The property value, or an empty string if the property is not set for the patch.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">An unknown patch or property was requested</exception>
+        /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetpatchinfo.asp">MsiGetPatchInfo</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetpatchinfoex.asp">MsiGetPatchInfoEx</a>
+        /// </p></remarks>
+        public override string this[string propertyName]
+        {
+            get
+            {
+                StringBuilder buf = new StringBuilder("");
+                uint bufSize = 0;
+                uint ret;
+
+                if (this.Context == UserContexts.UserManaged ||
+                    this.Context == UserContexts.UserUnmanaged ||
+                    this.Context == UserContexts.Machine)
+                {
+                    ret = NativeMethods.MsiGetPatchInfoEx(
+                        this.PatchCode,
+                        this.ProductCode,
+                        this.UserSid,
+                        this.Context,
+                        propertyName,
+                        buf,
+                        ref bufSize);
+                    if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                    {
+                        buf.Capacity = (int) ++bufSize;
+                        ret = NativeMethods.MsiGetPatchInfoEx(
+                            this.PatchCode,
+                            this.ProductCode,
+                            this.UserSid,
+                            this.Context,
+                            propertyName,
+                            buf,
+                            ref bufSize);
+                    }
+                }
+                else
+                {
+                    ret = NativeMethods.MsiGetPatchInfo(
+                        this.PatchCode,
+                        propertyName,
+                        buf,
+                        ref bufSize);
+                    if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                    {
+                        buf.Capacity = (int) ++bufSize;
+                        ret = NativeMethods.MsiGetPatchInfo(
+                            this.PatchCode,
+                            propertyName,
+                            buf,
+                            ref bufSize);
+                    }
+                }
+
+                if (ret != 0)
+                {
+                    return null;
+                }
+
+                return buf.ToString();
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/ProductInstallation.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/ProductInstallation.cs
new file mode 100644
index 00000000..27739e17
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/ProductInstallation.cs
@@ -0,0 +1,801 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Represents a unique instance of a product that
+    /// is either advertised, installed or unknown.
+    /// </summary>
+    public class ProductInstallation : Installation
+    {
+        /// <summary>
+        /// Gets the set of all products with a specified upgrade code. This method lists the
+        /// currently installed and advertised products that have the specified UpgradeCode
+        /// property in their Property table.
+        /// </summary>
+        /// <param name="upgradeCode">Upgrade code of related products</param>
+        /// <returns>Enumeration of product codes</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumrelatedproducts.asp">MsiEnumRelatedProducts</a>
+        /// </p></remarks>
+        public static IEnumerable<ProductInstallation> GetRelatedProducts(string upgradeCode)
+        {
+            StringBuilder buf = new StringBuilder(40);
+            for (uint i = 0; true; i++)
+            {
+                uint ret = NativeMethods.MsiEnumRelatedProducts(upgradeCode, 0, i, buf);
+                if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS) break;
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                yield return new ProductInstallation(buf.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Enumerates all product installations on the system.
+        /// </summary>
+        /// <returns>An enumeration of product objects.</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumproducts.asp">MsiEnumProducts</a>,
+        /// </p></remarks>
+        public static IEnumerable<ProductInstallation> AllProducts
+        {
+            get
+            {
+                return GetProducts(null, null, UserContexts.All);
+            }
+        }
+
+        /// <summary>
+        /// Enumerates product installations based on certain criteria.
+        /// </summary>
+        /// <param name="productCode">ProductCode (GUID) of the product instances to be enumerated. Only
+        /// instances of products within the scope of the context specified by the
+        /// <paramref name="userSid"/> and <paramref name="context"/> parameters will be
+        /// enumerated. This parameter may be set to null to enumerate all products in the specified
+        /// context.</param>
+        /// <param name="userSid">Specifies a security identifier (SID) that restricts the context
+        /// of enumeration. A SID value other than s-1-1-0 is considered a user SID and restricts
+        /// enumeration to the current user or any user in the system. The special SID string
+        /// s-1-1-0 (Everyone) specifies enumeration across all users in the system. This parameter
+        /// can be set to null to restrict the enumeration scope to the current user. When
+        /// <paramref name="context"/> is set to the machine context only,
+        /// <paramref name="userSid"/> must be null.</param>
+        /// <param name="context">Specifies the user context.</param>
+        /// <returns>An enumeration of product objects for enumerated product instances.</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumproductsex.asp">MsiEnumProductsEx</a>
+        /// </p></remarks>
+        public static IEnumerable<ProductInstallation> GetProducts(
+            string productCode, string userSid, UserContexts context)
+        {
+            StringBuilder buf = new StringBuilder(40);
+            UserContexts targetContext;
+            StringBuilder targetSidBuf = new StringBuilder(40);
+            for (uint i = 0; ; i++)
+            {
+                uint targetSidBufSize = (uint) targetSidBuf.Capacity;
+                uint ret = NativeMethods.MsiEnumProductsEx(
+                    productCode,
+                    userSid,
+                    context,
+                    i,
+                    buf,
+                    out targetContext,
+                    targetSidBuf,
+                    ref targetSidBufSize);
+                if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                {
+                    targetSidBuf.Capacity = (int) ++targetSidBufSize;
+                    ret = NativeMethods.MsiEnumProductsEx(
+                        productCode,
+                        userSid,
+                        context,
+                        i,
+                        buf,
+                        out targetContext,
+                        targetSidBuf,
+                        ref targetSidBufSize);
+                }
+
+                if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS)
+                {
+                    break;
+                }
+
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+
+                yield return new ProductInstallation(
+                    buf.ToString(),
+                    targetSidBuf.ToString(),
+                    targetContext);
+            }
+        }
+
+        private IDictionary<string, string> properties;
+
+        /// <summary>
+        /// Creates a new object for accessing information about a product installation on the current system.
+        /// </summary>
+        /// <param name="productCode">ProductCode (GUID) of the product.</param>
+        /// <remarks><p>
+        /// All available user contexts will be queried.
+        /// </p></remarks>
+        public ProductInstallation(string productCode)
+            : this(productCode, null, UserContexts.All)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new object for accessing information about a product installation on the current system.
+        /// </summary>
+        /// <param name="productCode">ProductCode (GUID) of the product.</param>
+        /// <param name="userSid">The specific user, when working in a user context.  This
+        /// parameter may be null to indicate the current user.  The parameter must be null
+        /// when working in a machine context.</param>
+        /// <param name="context">The user context. The calling process must have administrative
+        /// privileges to get information for a product installed for a user other than the
+        /// current user.</param>
+        public ProductInstallation(string productCode, string userSid, UserContexts context)
+            : base(productCode, userSid, context)
+        {
+            if (String.IsNullOrEmpty(productCode))
+            {
+                throw new ArgumentNullException("productCode");
+            }
+        }
+
+        internal ProductInstallation(IDictionary<string, string> properties)
+            : base(properties["ProductCode"], null, UserContexts.None)
+        {
+            this.properties = properties;
+        }
+
+        /// <summary>
+        /// Gets the set of published features for the product.
+        /// </summary>
+        /// <returns>Enumeration of published features for the product.</returns>
+        /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+        /// <remarks><p>
+        /// Because features are not ordered, any new feature has an arbitrary index, meaning
+        /// this property can return features in any order.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumfeatures.asp">MsiEnumFeatures</a>
+        /// </p></remarks>
+        public IEnumerable<FeatureInstallation> Features
+        {
+            get
+            {
+                StringBuilder buf = new StringBuilder(256);
+                for (uint i = 0; ; i++)
+                {
+                    uint ret = NativeMethods.MsiEnumFeatures(this.ProductCode, i, buf, null);
+
+                    if (ret != 0)
+                    {
+                        break;
+                    }
+
+                    yield return new FeatureInstallation(buf.ToString(), this.ProductCode);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the ProductCode (GUID) of the product.
+        /// </summary>
+        public string ProductCode
+        {
+            get { return this.InstallationCode; }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this product is installed on the current system.
+        /// </summary>
+        public override bool IsInstalled
+        {
+            get
+            {
+                return (this.State == InstallState.Default);
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this product is advertised on the current system.
+        /// </summary>
+        public bool IsAdvertised
+        {
+            get
+            {
+                return (this.State == InstallState.Advertised);
+            }
+        }
+
+        /// <summary>
+        /// Checks whether the product is installed with elevated privileges. An application is called
+        /// a "managed application" if elevated (system) privileges are used to install the application.
+        /// </summary>
+        /// <returns>True if the product is elevated; false otherwise</returns>
+        /// <remarks><p>
+        /// Note that this property does not take into account policies such as AlwaysInstallElevated,
+        /// but verifies that the local system owns the product's registry data.
+        /// </p></remarks>
+        public bool IsElevated
+        {
+            get
+            {
+                bool isElevated;
+                uint ret = NativeMethods.MsiIsProductElevated(this.ProductCode, out isElevated);
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                return isElevated;
+            }
+        }
+
+        /// <summary>
+        /// Gets the source list of this product installation.
+        /// </summary>
+        public override SourceList SourceList
+        {
+            get
+            {
+                return this.properties == null ? base.SourceList : null;
+            }
+        }
+
+        internal InstallState State
+        {
+            get
+            {
+                if (this.properties != null)
+                {
+                    return InstallState.Unknown;
+                }
+                else
+                {
+                    int installState = NativeMethods.MsiQueryProductState(this.ProductCode);
+                    return (InstallState) installState;
+                }
+            }
+        }
+
+        internal override int InstallationType
+        {
+            get
+            {
+                const int MSICODE_PRODUCT = 0x00000000;
+                return MSICODE_PRODUCT;
+            }
+        }
+
+        /// <summary>
+        /// The support link.
+        /// </summary>
+        public string HelpLink
+        {
+            get
+            {
+                return this["HelpLink"];
+            }
+        }
+
+        /// <summary>
+        /// The support telephone.
+        /// </summary>
+        public string HelpTelephone
+        {
+            get
+            {
+                return this["HelpTelephone"];
+            }
+        }
+
+        /// <summary>
+        /// Date and time the product was installed.
+        /// </summary>
+        public DateTime InstallDate
+        {
+            get
+            {
+                try
+                {
+                    return DateTime.ParseExact(
+                        this["InstallDate"], "yyyyMMdd", CultureInfo.InvariantCulture);
+                }
+                catch (FormatException)
+                {
+                    return DateTime.MinValue;
+                }
+            }
+        }
+
+        /// <summary>
+        /// The installed product name.
+        /// </summary>
+        public string ProductName
+        {
+            get
+            {
+                return this["InstalledProductName"];
+            }
+        }
+
+        /// <summary>
+        /// The installation location.
+        /// </summary>
+        public string InstallLocation
+        {
+            get
+            {
+                return this["InstallLocation"];
+            }
+        }
+
+        /// <summary>
+        /// The installation source.
+        /// </summary>
+        public string InstallSource
+        {
+            get
+            {
+                return this["InstallSource"];
+            }
+        }
+
+        /// <summary>
+        /// The local cached package.
+        /// </summary>
+        public string LocalPackage
+        {
+            get
+            {
+                return this["LocalPackage"];
+            }
+        }
+
+        /// <summary>
+        /// The publisher.
+        /// </summary>
+        public string Publisher
+        {
+            get
+            {
+                return this["Publisher"];
+            }
+        }
+
+        /// <summary>
+        /// URL about information.
+        /// </summary>
+        public Uri UrlInfoAbout
+        {
+            get
+            {
+                string value = this["URLInfoAbout"];
+                if (!String.IsNullOrEmpty(value))
+                {
+                    try
+                    {
+                        return new Uri(value);
+                    }
+                    catch (UriFormatException) { }
+                }
+
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The URL update information.
+        /// </summary>
+        public Uri UrlUpdateInfo
+        {
+            get
+            {
+                string value = this["URLUpdateInfo"];
+                if (!String.IsNullOrEmpty(value))
+                {
+                    try
+                    {
+                        return new Uri(value);
+                    }
+                    catch (UriFormatException) { }
+                }
+
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The product version.
+        /// </summary>
+        public Version ProductVersion
+        {
+            get
+            {
+                string ver = this["VersionString"];
+                return ProductInstallation.ParseVersion(ver);
+            }
+        }
+
+        /// <summary>
+        /// The product identifier.
+        /// </summary>
+        /// <remarks><p>
+        /// For more information, see
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/productid.asp">ProductID</a>
+        /// </p></remarks>
+        public string ProductId
+        {
+            get
+            {
+                return this["ProductID"];
+            }
+        }
+
+        /// <summary>
+        /// The company that is registered to use the product.
+        /// </summary>
+        public string RegCompany
+        {
+            get
+            {
+                return this["RegCompany"];
+            }
+        }
+
+        /// <summary>
+        /// The owner who is registered to use the product.
+        /// </summary>
+        public string RegOwner
+        {
+            get
+            {
+                return this["RegOwner"];
+            }
+        }
+
+        /// <summary>
+        /// Transforms.
+        /// </summary>
+        public string AdvertisedTransforms
+        {
+            get
+            {
+                return this["Transforms"];
+            }
+        }
+
+        /// <summary>
+        /// Product language.
+        /// </summary>
+        public string AdvertisedLanguage
+        {
+            get
+            {
+                return this["Language"];
+            }
+        }
+
+        /// <summary>
+        /// Human readable product name.
+        /// </summary>
+        public string AdvertisedProductName
+        {
+            get
+            {
+                return this["ProductName"];
+            }
+        }
+
+        /// <summary>
+        /// True if the product is advertised per-machine;
+        /// false if it is per-user or not advertised.
+        /// </summary>
+        public bool AdvertisedPerMachine
+        {
+            get
+            {
+                return this["AssignmentType"] == "1";
+            }
+        }
+
+        /// <summary>
+        /// Identifier of the package that a product is installed from.
+        /// </summary>
+        public string AdvertisedPackageCode
+        {
+            get
+            {
+                return this["PackageCode"];
+            }
+        }
+
+        /// <summary>
+        /// Version of the advertised product.
+        /// </summary>
+        public Version AdvertisedVersion
+        {
+            get
+            {
+                string ver = this["Version"];
+                return ProductInstallation.ParseVersion(ver);
+            }
+        }
+
+        /// <summary>
+        /// Primary icon for the package.
+        /// </summary>
+        public string AdvertisedProductIcon
+        {
+            get
+            {
+                return this["ProductIcon"];
+            }
+        }
+
+        /// <summary>
+        /// Name of the installation package for the advertised product.
+        /// </summary>
+        public string AdvertisedPackageName
+        {
+            get
+            {
+                return this["PackageName"];
+            }
+        }
+
+        /// <summary>
+        /// True if the advertised product can be serviced by
+        /// non-administrators without elevation.
+        /// </summary>
+        public bool PrivilegedPatchingAuthorized
+        {
+            get
+            {
+                return this["AuthorizedLUAApp"] == "1";
+            }
+        }
+
+        /// <summary>
+        /// Gets information about an installation of a product. 
+        /// </summary>
+        /// <param name="propertyName">Name of the property being retrieved.</param>
+        /// <exception cref="ArgumentOutOfRangeException">An unknown product or property was requested</exception>
+        /// <exception cref="InstallerException">The installer configuration data is corrupt</exception>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetproductinfo.asp">MsiGetProductInfo</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetproductinfoex.asp">MsiGetProductInfoEx</a>
+        /// </p></remarks>
+        public override string this[string propertyName]
+        {
+            get
+            {
+                if (this.properties != null)
+                {
+                    string value = null;
+                    this.properties.TryGetValue(propertyName, out value);
+                    return value;
+                }
+                else
+                {
+                    StringBuilder buf = new StringBuilder(40);
+                    uint bufSize = (uint) buf.Capacity;
+                    uint ret;
+
+                    if (this.Context == UserContexts.UserManaged ||
+                        this.Context == UserContexts.UserUnmanaged ||
+                        this.Context == UserContexts.Machine)
+                    {
+                        ret = NativeMethods.MsiGetProductInfoEx(
+                            this.ProductCode,
+                            this.UserSid,
+                            this.Context,
+                            propertyName,
+                            buf,
+                            ref bufSize);
+                        if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                        {
+                            buf.Capacity = (int) ++bufSize;
+                            ret = NativeMethods.MsiGetProductInfoEx(
+                                this.ProductCode,
+                                this.UserSid,
+                                this.Context,
+                                propertyName,
+                                buf,
+                                ref bufSize);
+                        }
+                    }
+                    else
+                    {
+                        ret = NativeMethods.MsiGetProductInfo(
+                            this.ProductCode,
+                            propertyName,
+                            buf,
+                            ref bufSize);
+                        if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                        {
+                            buf.Capacity = (int) ++bufSize;
+                            ret = NativeMethods.MsiGetProductInfo(
+                                this.ProductCode,
+                                propertyName,
+                                buf,
+                                ref bufSize);
+                        }
+                    }
+
+                    if (ret != 0)
+                    {
+                        return null;
+                    }
+
+                    return buf.ToString();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the installed state for a product feature.
+        /// </summary>
+        /// <param name="feature">The feature being queried; identifier from the
+        /// Feature table</param>
+        /// <returns>Installation state of the feature for the product instance: either
+        /// <see cref="InstallState.Local"/>, <see cref="InstallState.Source"/>,
+        /// or <see cref="InstallState.Advertised"/>.</returns>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiqueryfeaturestate.asp">MsiQueryFeatureState</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiqueryfeaturestateex.asp">MsiQueryFeatureStateEx</a>
+        /// </p></remarks>
+        public InstallState GetFeatureState(string feature)
+        {
+            if (this.properties != null)
+            {
+                return InstallState.Unknown;
+            }
+            else
+            {
+                int installState;
+                uint ret = NativeMethods.MsiQueryFeatureStateEx(
+                    this.ProductCode,
+                    this.UserSid,
+                    this.Context,
+                    feature,
+                    out installState);
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                return (InstallState) installState;
+            }
+        }
+
+        /// <summary>
+        /// Gets the installed state for a product component.
+        /// </summary>
+        /// <param name="component">The component being queried; GUID of the component
+        /// as found in the ComponentId column of the Component table.</param>
+        /// <returns>Installation state of the component for the product instance: either
+        /// <see cref="InstallState.Local"/> or <see cref="InstallState.Source"/>.</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiquerycomponnetstate.asp">MsiQueryComponentState</a>
+        /// </p></remarks>
+        public InstallState GetComponentState(string component)
+        {
+            if (this.properties != null)
+            {
+                return InstallState.Unknown;
+            }
+            else
+            {
+                int installState;
+                uint ret = NativeMethods.MsiQueryComponentState(
+                    this.ProductCode,
+                    this.UserSid,
+                    this.Context,
+                    component,
+                    out installState);
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                return (InstallState) installState;
+            }
+        }
+
+        /// <summary>
+        /// Obtains and stores the user information and product ID from an installation wizard.
+        /// </summary>
+        /// <remarks><p>
+        /// This method is typically called by an application during the first run of the application. The application
+        /// first gets the <see cref="ProductInstallation.ProductId"/> or <see cref="ProductInstallation.RegOwner"/>.
+        /// If those properties are missing, the application calls CollectUserInfo.
+        /// CollectUserInfo opens the product's installation package and invokes a wizard sequence that collects
+        /// user information. Upon completion of the sequence, user information is registered. Since this API requires
+        /// an authored user interface, the user interface level should be set to full by calling
+        /// <see cref="Installer.SetInternalUI(InstallUIOptions)"/> as <see cref="InstallUIOptions.Full"/>.
+        /// </p><p>
+        /// The CollectUserInfo method invokes a FirstRun dialog from the product installation database.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msicollectuserinfo.asp">MsiCollectUserInfo</a>
+        /// </p></remarks>
+        public void CollectUserInfo()
+        {
+            if (this.properties == null)
+            {
+                uint ret = NativeMethods.MsiCollectUserInfo(this.InstallationCode);
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Some products might write some invalid/nonstandard version strings to the registry.
+        /// This method tries to get the best data it can.
+        /// </summary>
+        /// <param name="ver">Version string retrieved from the registry.</param>
+        /// <returns>Version object, or null if the version string is completely invalid.</returns>
+        private static Version ParseVersion(string ver)
+        {
+            if (ver != null)
+            {
+                int dotCount = 0;
+                for (int i = 0; i < ver.Length; i++)
+                {
+                    char c = ver[i];
+                    if (c == '.') dotCount++;
+                    else if (!Char.IsDigit(c))
+                    {
+                        ver = ver.Substring(0, i);
+                        break;
+                    }
+                }
+
+                if (ver.Length > 0)
+                {
+                    if (dotCount == 0)
+                    {
+                        ver = ver + ".0";
+                    }
+                    else if (dotCount > 3)
+                    {
+                        string[] verSplit = ver.Split('.');
+                        ver = String.Join(".", verSplit, 0, 4);
+                    }
+
+                    try
+                    {
+                        return new Version(ver);
+                    }
+                    catch (ArgumentException)
+                    {
+                    }
+                }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Record.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/Record.cs
new file mode 100644
index 00000000..2d31fa75
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Record.cs
@@ -0,0 +1,1048 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// The Record object is a container for holding and transferring a variable number of values.
+    /// Fields within the record are numerically indexed and can contain strings, integers, streams,
+    /// and null values. Record fields are indexed starting with 1.  Field 0 is a special format field.
+    /// </summary>
+    /// <remarks><p>
+    /// Most methods on the Record class have overloads that allow using either a number
+    /// or a name to designate a field. However note that field names only exist when the
+    /// Record is directly returned from a query on a database. For other records, attempting
+    /// to access a field by name will result in an InvalidOperationException.
+    /// </p></remarks>
+    public class Record : InstallerHandle
+    {
+        private View view;
+        private bool isFormatStringInvalid;
+
+        /// <summary>
+        /// IsFormatStringInvalid is set from several View methods that invalidate the FormatString
+        /// and used to determine behavior during Record.ToString().
+        /// </summary>
+        internal protected bool IsFormatStringInvalid
+        {
+            set { this.isFormatStringInvalid = value; }
+
+            get { return this.isFormatStringInvalid; }
+        }
+
+        /// <summary>
+        /// Creates a new record object with the requested number of fields.
+        /// </summary>
+        /// <param name="fieldCount">Required number of fields, which may be 0.
+        /// The maximum number of fields in a record is limited to 65535.</param>
+        /// <remarks><p>
+        /// The Record object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// It is best that the handle be closed manually as soon as it is no longer
+        /// needed, as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msicreaterecord.asp">MsiCreateRecord</a>
+        /// </p></remarks>
+        public Record(int fieldCount)
+            : this((IntPtr) RemotableNativeMethods.MsiCreateRecord((uint) fieldCount, 0), true, (View) null)
+        {
+        }
+
+        /// <summary>
+        /// Creates a new record object, providing values for an arbitrary number of fields.
+        /// </summary>
+        /// <param name="fields">The values of the record fields.  The parameters should be of type Int16, Int32 or String</param>
+        /// <remarks><p>
+        /// The Record object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// It is best that the handle be closed manually as soon as it is no longer
+        /// needed, as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msicreaterecord.asp">MsiCreateRecord</a>
+        /// </p></remarks>
+        public Record(params object[] fields)
+            : this(fields.Length)
+        {
+            for (int i = 0; i < fields.Length; i++)
+            {
+                this[i + 1] = fields[i];
+            }
+        }
+
+        internal Record(IntPtr handle, bool ownsHandle, View view)
+            : base(handle, ownsHandle)
+        {
+            this.view = view;
+        }
+
+        /// <summary>
+        /// Gets the number of fields in a record.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordgetfieldcount.asp">MsiRecordGetFieldCount</a>
+        /// </p></remarks>
+        public int FieldCount
+        {
+            get
+            {
+                return (int) RemotableNativeMethods.MsiRecordGetFieldCount((int) this.Handle);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets field 0 of the Record, which is the format string.
+        /// </summary>
+        public string FormatString
+        {
+            get { return this.GetString(0); }
+            set { this.SetString(0, value); }
+        }
+
+        /// <summary>
+        /// Gets or sets a record field value.
+        /// </summary>
+        /// <param name="fieldName">Specifies the name of the field of the Record to get or set.</param>
+        /// <exception cref="ArgumentOutOfRangeException">The name does not match any known field of the Record.</exception>
+        /// <remarks><p>
+        /// When getting a field, the type of the object returned depends on the type of the Record field.
+        /// The object will be one of: Int16, Int32, String, Stream, or null.
+        /// </p><p>
+        /// When setting a field, the type of the object provided will be converted to match the View
+        /// query that returned the record, or if Record was not returned from a view then the type of
+        /// the object provided will determine the type of the Record field. The object should be one of:
+        /// Int16, Int32, String, Stream, or null.
+        /// </p></remarks>
+        public object this[string fieldName]
+        {
+            get
+            {
+                int field = this.FindColumn(fieldName);
+                return this[field];
+            }
+
+            set
+            {
+                int field = this.FindColumn(fieldName);
+                this[field] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a record field value.
+        /// </summary>
+        /// <param name="field">Specifies the field of the Record to get or set.</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// Record fields are indexed starting with 1.  Field 0 is a special format field.
+        /// </p><p>
+        /// When getting a field, the type of the object returned depends on the type of the Record field.
+        /// The object will be one of: Int16, Int32, String, Stream, or null.  If the Record was returned
+        /// from a View, the type will match that of the field from the View query.  Otherwise, the type
+        /// will match the type of the last value set for the field.
+        /// </p><p>
+        /// When setting a field, the type of the object provided will be converted to match the View
+        /// query that returned the Record, or if Record was not returned from a View then the type of
+        /// the object provided will determine the type of the Record field. The object should be one of:
+        /// Int16, Int32, String, Stream, or null.
+        /// </p><p>
+        /// The type-specific getters and setters are slightly more efficient than this property, since
+        /// they don't have to do the extra work to infer the value's type every time.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordgetinteger.asp">MsiRecordGetInteger</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordgetstring.asp">MsiRecordGetString</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordsetinteger.asp">MsiRecordSetInteger</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordsetstring.asp">MsiRecordSetString</a>
+        /// </p></remarks>
+        public object this[int field]
+        {
+            get
+            {
+                if (field == 0)
+                {
+                    return this.GetString(0);
+                }
+                else
+                {
+                    Type valueType = null;
+                    if (this.view != null)
+                    {
+                        this.CheckRange(field);
+
+                        valueType = this.view.Columns[field - 1].Type;
+                    }
+
+                    if (valueType == null || valueType == typeof(String))
+                    {
+                        return this.GetString(field);
+                    }
+                    else if (valueType == typeof(Stream))
+                    {
+                        return this.IsNull(field) ? null : new RecordStream(this, field);
+                    }
+                    else
+                    {
+                        int? value = this.GetNullableInteger(field);
+                        return value.HasValue ? (object) value.Value : null;
+                    }
+                }
+            }
+
+            set
+            {
+                if (field == 0)
+                {
+                    if (value == null)
+                    {
+                        value = String.Empty;
+                    }
+
+                    this.SetString(0, value.ToString());
+                }
+                else if (value == null)
+                {
+                    this.SetNullableInteger(field, null);
+                }
+                else
+                {
+                    Type valueType = value.GetType();
+                    if (valueType == typeof(Int32) || valueType == typeof(Int16))
+                    {
+                        this.SetInteger(field, (int) value);
+                    }
+                    else if (valueType.IsSubclassOf(typeof(Stream)))
+                    {
+                        this.SetStream(field, (Stream) value);
+                    }
+                    else
+                    {
+                        this.SetString(field, value.ToString());
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates a new Record object from an integer record handle.
+        /// </summary>
+        /// <remarks><p>
+        /// This method is only provided for interop purposes.  A Record object
+        /// should normally be obtained by calling <see cref="WixToolset.Dtf.WindowsInstaller.View.Fetch"/>
+        /// other methods.
+        /// <p>The handle will be closed when this object is disposed or finalized.</p>
+        /// </p></remarks>
+        /// <param name="handle">Integer record handle</param>
+        /// <param name="ownsHandle">true to close the handle when this object is disposed or finalized</param>
+        public static Record FromHandle(IntPtr handle, bool ownsHandle)
+        {
+            return new Record(handle, ownsHandle, (View) null);
+        }
+        
+        /// <summary>
+        /// Sets all fields in a record to null.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordcleardata.asp">MsiRecordClearData</a>
+        /// </p></remarks>
+        public void Clear()
+        {
+            uint ret = RemotableNativeMethods.MsiRecordClearData((int) this.Handle);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Reports whether a record field is null.
+        /// </summary>
+        /// <param name="field">Specifies the field to check.</param>
+        /// <returns>True if the field is null, false otherwise.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordisnull.asp">MsiRecordIsNull</a>
+        /// </p></remarks>
+        public bool IsNull(int field)
+        {
+            this.CheckRange(field);
+            return RemotableNativeMethods.MsiRecordIsNull((int) this.Handle, (uint) field);
+        }
+
+        /// <summary>
+        /// Reports whether a record field is null.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field to check.</param>
+        /// <returns>True if the field is null, false otherwise.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        public bool IsNull(string fieldName)
+        {
+            int field = this.FindColumn(fieldName);
+            return this.IsNull(field);
+        }
+
+        /// <summary>
+        /// Gets the length of a record field. The count does not include the terminating null.
+        /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// The returned data size is 0 if the field is null, non-existent,
+        /// or an internal object pointer. The method also returns 0 if the handle is not a valid
+        /// Record handle.
+        /// </p><p>
+        /// If the data is in integer format, the property returns 2 or 4.
+        /// </p><p>
+        /// If the data is in string format, the property returns the character count
+        /// (not including the NULL terminator).
+        /// </p><p>
+        /// If the data is in stream format, the property returns the byte count.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecorddatasize.asp">MsiRecordDataSize</a>
+        /// </p></remarks>
+        public int GetDataSize(int field)
+        {
+            this.CheckRange(field);
+            return (int) RemotableNativeMethods.MsiRecordDataSize((int) this.Handle, (uint) field);
+        }
+
+        /// <summary>
+        /// Gets the length of a record field. The count does not include the terminating null.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field to check.</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        /// <remarks><p>The returned data size is 0 if the field is null, non-existent,
+        /// or an internal object pointer. The method also returns 0 if the handle is not a valid
+        /// Record handle.
+        /// </p><p>
+        /// If the data is in integer format, the property returns 2 or 4.
+        /// </p><p>
+        /// If the data is in string format, the property returns the character count
+        /// (not including the NULL terminator).
+        /// </p><p>
+        /// If the data is in stream format, the property returns the byte count.
+        /// </p></remarks>
+        public int GetDataSize(string fieldName)
+        {
+            int field = this.FindColumn(fieldName);
+            return this.GetDataSize(field);
+        }
+
+        /// <summary>
+        /// Gets a field value as an integer.
+        /// </summary>
+        /// <param name="field">Specifies the field to retrieve.</param>
+        /// <returns>Integer value of the field, or 0 if the field is null.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordgetinteger.asp">MsiRecordGetInteger</a>
+        /// </p></remarks>
+        /// <seealso cref="GetNullableInteger(int)"/>
+        [SuppressMessage("Microsoft.Naming", "CA1720:IdentifiersShouldNotContainTypeNames", MessageId = "integer")]
+        public int GetInteger(int field)
+        {
+            this.CheckRange(field);
+
+            int value = RemotableNativeMethods.MsiRecordGetInteger((int) this.Handle, (uint) field);
+            if (value == Int32.MinValue)  // MSI_NULL_INTEGER
+            {
+                return 0;
+            }
+            return value;
+        }
+
+        /// <summary>
+        /// Gets a field value as an integer.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field to retrieve.</param>
+        /// <returns>Integer value of the field, or 0 if the field is null.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        /// <seealso cref="GetNullableInteger(string)"/>
+        [SuppressMessage("Microsoft.Naming", "CA1720:IdentifiersShouldNotContainTypeNames", MessageId = "integer")]
+        public int GetInteger(string fieldName)
+        {
+            int field = this.FindColumn(fieldName);
+            return this.GetInteger(field);
+        }
+
+        /// <summary>
+        /// Gets a field value as an integer.
+        /// </summary>
+        /// <param name="field">Specifies the field to retrieve.</param>
+        /// <returns>Integer value of the field, or null if the field is null.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordgetinteger.asp">MsiRecordGetInteger</a>
+        /// </p></remarks>
+        /// <seealso cref="GetInteger(int)"/>
+        public int? GetNullableInteger(int field)
+        {
+            this.CheckRange(field);
+
+            int value = RemotableNativeMethods.MsiRecordGetInteger((int) this.Handle, (uint) field);
+            if (value == Int32.MinValue)  // MSI_NULL_INTEGER
+            {
+                return null;
+            }
+            return value;
+        }
+
+        /// <summary>
+        /// Gets a field value as an integer.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field to retrieve.</param>
+        /// <returns>Integer value of the field, or null if the field is null.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        /// <seealso cref="GetInteger(string)"/>
+        public int? GetNullableInteger(string fieldName)
+        {
+            int field = this.FindColumn(fieldName);
+            return this.GetInteger(field);
+        }
+
+        /// <summary>
+        /// Sets the value of a field to an integer.
+        /// </summary>
+        /// <param name="field">Specifies the field to set.</param>
+        /// <param name="value">new value of the field</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordsetinteger.asp">MsiRecordSetInteger</a>
+        /// </p></remarks>
+        /// <seealso cref="SetNullableInteger(int,int?)"/>
+        public void SetInteger(int field, int value)
+        {
+            this.CheckRange(field);
+
+            uint ret = RemotableNativeMethods.MsiRecordSetInteger((int) this.Handle, (uint) field, value);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Sets the value of a field to an integer.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field to set.</param>
+        /// <param name="value">new value of the field</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        /// <seealso cref="SetNullableInteger(string,int?)"/>
+        public void SetInteger(string fieldName, int value)
+        {
+            int field = this.FindColumn(fieldName);
+            this.SetInteger(field, value);
+        }
+
+        /// <summary>
+        /// Sets the value of a field to a nullable integer.
+        /// </summary>
+        /// <param name="field">Specifies the field to set.</param>
+        /// <param name="value">new value of the field</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordsetinteger.asp">MsiRecordSetInteger</a>
+        /// </p></remarks>
+        /// <seealso cref="SetInteger(int,int)"/>
+        public void SetNullableInteger(int field, int? value)
+        {
+            this.CheckRange(field);
+
+            uint ret = RemotableNativeMethods.MsiRecordSetInteger(
+                (int) this.Handle,
+                (uint) field,
+                value.HasValue ? (int) value : Int32.MinValue);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Sets the value of a field to a nullable integer.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field to set.</param>
+        /// <param name="value">new value of the field</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        /// <seealso cref="SetInteger(string,int)"/>
+        public void SetNullableInteger(string fieldName, int? value)
+        {
+            int field = this.FindColumn(fieldName);
+            this.SetNullableInteger(field, value);
+        }
+
+        /// <summary>
+        /// Gets a field value as a string.
+        /// </summary>
+        /// <param name="field">Specifies the field to retrieve.</param>
+        /// <returns>String value of the field, or an empty string if the field is null.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordgetstring.asp">MsiRecordGetString</a>
+        /// </p></remarks>
+        public string GetString(int field)
+        {
+            this.CheckRange(field);
+
+            StringBuilder buf = new StringBuilder(String.Empty);
+            uint bufSize = 0;
+            uint ret = RemotableNativeMethods.MsiRecordGetString((int) this.Handle, (uint) field, buf, ref bufSize);
+            if (ret == (uint) NativeMethods.Error.MORE_DATA)
+            {
+                buf.Capacity = (int) ++bufSize;
+                ret = RemotableNativeMethods.MsiRecordGetString((int) this.Handle, (uint) field, buf, ref bufSize);
+            }
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return buf.ToString();
+        }
+
+        /// <summary>
+        /// Gets a field value as a string.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field to retrieve.</param>
+        /// <returns>String value of the field, or an empty string if the field is null.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        public string GetString(string fieldName)
+        {
+            int field = this.FindColumn(fieldName);
+            return this.GetString(field);
+        }
+
+        /// <summary>
+        /// Sets the value of a field to a string.
+        /// </summary>
+        /// <param name="field">Specifies the field to set.</param>
+        /// <param name="value">new value of the field</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordsetstring.asp">MsiRecordSetString</a>
+        /// </p></remarks>
+        public void SetString(int field, string value)
+        {
+            this.CheckRange(field);
+
+            if (value == null)
+            {
+                value = String.Empty;
+            }
+
+            uint ret = RemotableNativeMethods.MsiRecordSetString((int) this.Handle, (uint) field, value);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+
+            // If we set the FormatString manually, then it should be valid again
+            if (field == 0)
+            {
+                this.IsFormatStringInvalid = false;
+            }
+        }
+
+        /// <summary>
+        /// Sets the value of a field to a string.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field to set.</param>
+        /// <param name="value">new value of the field</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        public void SetString(string fieldName, string value)
+        {
+            int field = this.FindColumn(fieldName);
+            this.SetString(field, value);
+        }
+
+        /// <summary>
+        /// Reads a record stream field into a file.
+        /// </summary>
+        /// <param name="field">Specifies the field of the Record to get.</param>
+        /// <param name="filePath">Specifies the path to the file to contain the stream.</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <exception cref="NotSupportedException">Attempt to extract a storage from a database open
+        /// in read-write mode, or from a database without an associated file path</exception>
+        /// <remarks><p>
+        /// This method is capable of directly extracting substorages. To do so, first select both the
+        /// `Name` and `Data` column of the `_Storages` table, then get the stream of the `Data` field.
+        /// However, substorages may only be extracted from a database that is open in read-only mode.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordreadstream.asp">MsiRecordReadStream</a>
+        /// </p></remarks>
+        public void GetStream(int field, string filePath)
+        {
+            if (String.IsNullOrEmpty(filePath))
+            {
+                throw new ArgumentNullException("filePath");
+            }
+
+            IList<TableInfo> tables = (this.view != null ? this.view.Tables : null);
+            if (tables != null && tables.Count == 1 && tables[0].Name == "_Storages" && field == this.FindColumn("Data"))
+            {
+                if (!this.view.Database.IsReadOnly)
+                {
+                    throw new NotSupportedException("Database must be opened read-only to support substorage extraction.");
+                }
+                else if (this.view.Database.FilePath == null)
+                {
+                    throw new NotSupportedException("Database must have an associated file path to support substorage extraction.");
+                }
+                else if (this.FindColumn("Name") <= 0)
+                {
+                    throw new NotSupportedException("Name column must be part of the Record in order to extract substorage.");
+                }
+                else
+                {
+                    Record.ExtractSubStorage(this.view.Database.FilePath, this.GetString("Name"), filePath);
+                }
+            }
+            else
+            {
+                if (!this.IsNull(field))
+                {
+                    Stream readStream = null, writeStream = null;
+                    try
+                    {
+                        readStream = new RecordStream(this, field);
+                        writeStream = new FileStream(filePath, FileMode.Create, FileAccess.Write);
+                        int count = 512;
+                        byte[] buf = new byte[count];
+                        while (count == buf.Length)
+                        {
+                            if ((count = readStream.Read(buf, 0, buf.Length)) > 0)
+                            {
+                                writeStream.Write(buf, 0, count);
+                            }
+                        }
+                    }
+                    finally
+                    {
+                        if (readStream != null) readStream.Close();
+                        if (writeStream != null) writeStream.Close();
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Reads a record stream field into a file.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field of the Record to get.</param>
+        /// <param name="filePath">Specifies the path to the file to contain the stream.</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        /// <exception cref="NotSupportedException">Attempt to extract a storage from a database open
+        /// in read-write mode, or from a database without an associated file path</exception>
+        /// <remarks><p>
+        /// This method is capable of directly extracting substorages. To do so, first select both the
+        /// `Name` and `Data` column of the `_Storages` table, then get the stream of the `Data` field.
+        /// However, substorages may only be extracted from a database that is open in read-only mode.
+        /// </p></remarks>
+        public void GetStream(string fieldName, string filePath)
+        {
+            int field = this.FindColumn(fieldName);
+            this.GetStream(field, filePath);
+        }
+
+        /// <summary>
+        /// Gets a record stream field.
+        /// </summary>
+        /// <param name="field">Specifies the field of the Record to get.</param>
+        /// <returns>A Stream that reads the field data.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// This method is not capable of reading substorages. To extract a substorage,
+        /// use <see cref="GetStream(int,string)"/>.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordreadstream.asp">MsiRecordReadStream</a>
+        /// </p></remarks>
+        public Stream GetStream(int field)
+        {
+            this.CheckRange(field);
+
+            return this.IsNull(field) ? null : new RecordStream(this, field);
+        }
+
+        /// <summary>
+        /// Gets a record stream field.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field of the Record to get.</param>
+        /// <returns>A Stream that reads the field data.</returns>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        /// <remarks><p>
+        /// This method is not capable of reading substorages. To extract a substorage,
+        /// use <see cref="GetStream(string,string)"/>.
+        /// </p></remarks>
+        public Stream GetStream(string fieldName)
+        {
+            int field = this.FindColumn(fieldName);
+            return this.GetStream(field);
+        }
+
+        /// <summary>
+        /// Sets a record stream field from a file. Stream data cannot be inserted into temporary fields.
+        /// </summary>
+        /// <param name="field">Specifies the field of the Record to set.</param>
+        /// <param name="filePath">Specifies the path to the file containing the stream.</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// The contents of the specified file are read into a stream object. The stream persists if
+        /// the Record is inserted into the Database and the Database is committed.
+        /// </p><p>
+        /// To reset the stream to its beginning you must pass in null for filePath.
+        /// Do not pass an empty string, "", to reset the stream.
+        /// </p><p>
+        /// Setting a stream with this method is more efficient than setting a field to a
+        /// FileStream object.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordsetstream.asp">MsiRecordsetStream</a>
+        /// </p></remarks>
+        public void SetStream(int field, string filePath)
+        {
+            this.CheckRange(field);
+
+            if (String.IsNullOrEmpty(filePath))
+            {
+                throw new ArgumentNullException("filePath");
+            }
+
+            uint ret = RemotableNativeMethods.MsiRecordSetStream((int) this.Handle, (uint) field, filePath);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Sets a record stream field from a file. Stream data cannot be inserted into temporary fields.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field name of the Record to set.</param>
+        /// <param name="filePath">Specifies the path to the file containing the stream.</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        /// <remarks><p>
+        /// The contents of the specified file are read into a stream object. The stream persists if
+        /// the Record is inserted into the Database and the Database is committed.
+        /// To reset the stream to its beginning you must pass in null for filePath.
+        /// Do not pass an empty string, "", to reset the stream.
+        /// </p><p>
+        /// Setting a stream with this method is more efficient than setting a field to a
+        /// FileStream object.
+        /// </p></remarks>
+        public void SetStream(string fieldName, string filePath)
+        {
+            int field = this.FindColumn(fieldName);
+            this.SetStream(field, filePath);
+        }
+
+        /// <summary>
+        /// Sets a record stream field from a Stream object. Stream data cannot be inserted into temporary fields.
+        /// </summary>
+        /// <param name="field">Specifies the field of the Record to set.</param>
+        /// <param name="stream">Specifies the stream data.</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field is less than 0 or greater than the
+        /// number of fields in the Record.</exception>
+        /// <remarks><p>
+        /// The stream persists if the Record is inserted into the Database and the Database is committed.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msirecordsetstream.asp">MsiRecordsetStream</a>
+        /// </p></remarks>
+        public void SetStream(int field, Stream stream)
+        {
+            this.CheckRange(field);
+
+            if (stream == null)
+            {
+                uint ret = RemotableNativeMethods.MsiRecordSetStream((int) this.Handle, (uint) field, null);
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+            else
+            {
+                Stream writeStream = null;
+                string tempPath = Path.GetTempFileName();
+                try
+                {
+                    writeStream = new FileStream(tempPath, FileMode.Truncate, FileAccess.Write);
+                    byte[] buf = new byte[512];
+                    int count;
+                    while ((count = stream.Read(buf, 0, buf.Length)) > 0)
+                    {
+                        writeStream.Write(buf, 0, count);
+                    }
+                    writeStream.Close();
+                    writeStream = null;
+
+                    uint ret = RemotableNativeMethods.MsiRecordSetStream((int) this.Handle, (uint) field, tempPath);
+                    if (ret != 0)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                }
+                finally
+                {
+                    if (writeStream != null) writeStream.Close();
+                    if (File.Exists(tempPath))
+                    {
+                        try
+                        {
+                            File.Delete(tempPath);
+                        }
+                        catch (IOException)
+                        {
+                            if (this.view != null)
+                            {
+                                this.view.Database.DeleteOnClose(tempPath);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sets a record stream field from a Stream object. Stream data cannot be inserted into temporary fields.
+        /// </summary>
+        /// <param name="fieldName">Specifies the field name of the Record to set.</param>
+        /// <param name="stream">Specifies the stream data.</param>
+        /// <exception cref="ArgumentOutOfRangeException">The field name does not match any
+        /// of the named fields in the Record.</exception>
+        /// <remarks><p>
+        /// The stream persists if the Record is inserted into the Database and the Database is committed.
+        /// </p></remarks>
+        public void SetStream(string fieldName, Stream stream)
+        {
+            int field = this.FindColumn(fieldName);
+            this.SetStream(field, stream);
+        }
+
+        /// <summary>
+        /// Gets a formatted string representation of the Record.
+        /// </summary>
+        /// <returns>A formatted string representation of the Record.</returns>
+        /// <remarks><p>
+        /// If field 0 of the Record is set to a nonempty string, it is used to format the data in the Record.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiformatrecord.asp">MsiFormatRecord</a>
+        /// </p></remarks>
+        /// <seealso cref="FormatString"/>
+        /// <seealso cref="Session.FormatRecord(Record)"/>
+        public override string ToString()
+        {
+            return this.ToString((IFormatProvider) null);
+        }
+
+        /// <summary>
+        /// Gets a formatted string representation of the Record, optionally using a Session to format properties.
+        /// </summary>
+        /// <param name="provider">an optional Session instance that will be used to lookup any
+        /// properties in the Record's format string</param>
+        /// <returns>A formatted string representation of the Record.</returns>
+        /// <remarks><p>
+        /// If field 0 of the Record is set to a nonempty string, it is used to format the data in the Record.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiformatrecord.asp">MsiFormatRecord</a>
+        /// </p></remarks>
+        /// <seealso cref="FormatString"/>
+        /// <seealso cref="Session.FormatRecord(Record)"/>
+        public string ToString(IFormatProvider provider)
+        {
+            if (this.IsFormatStringInvalid) // Format string is invalid
+            {
+                // TODO: return all values by default?
+                return String.Empty;
+            }
+
+            InstallerHandle session = provider as InstallerHandle;
+            int sessionHandle = session != null ? (int) session.Handle : 0;
+            StringBuilder buf = new StringBuilder(String.Empty);
+            uint bufSize = 1;
+            uint ret = RemotableNativeMethods.MsiFormatRecord(sessionHandle, (int) this.Handle, buf, ref bufSize);
+            if (ret == (uint) NativeMethods.Error.MORE_DATA)
+            {
+                bufSize++;
+                buf = new StringBuilder((int) bufSize);
+                ret = RemotableNativeMethods.MsiFormatRecord(sessionHandle, (int) this.Handle, buf, ref bufSize);
+            }
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return buf.ToString();
+        }
+
+        /// <summary>
+        /// Gets a formatted string representation of the Record.
+        /// </summary>
+        /// <param name="format">String to be used to format the data in the Record,
+        /// instead of the Record's format string.</param>
+        /// <returns>A formatted string representation of the Record.</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiformatrecord.asp">MsiFormatRecord</a>
+        /// </p></remarks>
+        [Obsolete("This method is obsolete because it has undesirable side-effects. As an alternative, set the FormatString " +
+            "property separately before calling the ToString() override that takes no parameters.")]
+        public string ToString(string format)
+        {
+            return this.ToString(format, null);
+        }
+
+        /// <summary>
+        /// Gets a formatted string representation of the Record, optionally using a Session to format properties.
+        /// </summary>
+        /// <param name="format">String to be used to format the data in the Record,
+        /// instead of the Record's format string.</param>
+        /// <param name="provider">an optional Session instance that will be used to lookup any
+        /// properties in the Record's format string</param>
+        /// <returns>A formatted string representation of the Record.</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiformatrecord.asp">MsiFormatRecord</a>
+        /// </p></remarks>
+        /// <seealso cref="FormatString"/>
+        /// <seealso cref="Session.FormatRecord(Record)"/>
+        [Obsolete("This method is obsolete because it has undesirable side-effects. As an alternative, set the FormatString " +
+            "property separately before calling the ToString() override that takes just a format provider.")]
+        public string ToString(string format, IFormatProvider provider)
+        {
+            if (format == null)
+            {
+                return this.ToString(provider);
+            }
+            else if (format.Length == 0)
+            {
+                return String.Empty;
+            }
+            else
+            {
+                string savedFormatString = (string) this[0];
+                try
+                {
+                    this.FormatString = format;
+                    return this.ToString(provider);
+                }
+                finally
+                {
+                    this.FormatString = savedFormatString;
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        private static void ExtractSubStorage(string databaseFile, string storageName, string extractFile)
+        {
+            IStorage storage;
+            NativeMethods.STGM openMode = NativeMethods.STGM.READ | NativeMethods.STGM.SHARE_DENY_WRITE;
+            int hr = NativeMethods.StgOpenStorage(databaseFile, IntPtr.Zero, (uint) openMode, IntPtr.Zero, 0, out storage);
+            if (hr != 0)
+            {
+                Marshal.ThrowExceptionForHR(hr);
+            }
+
+            try
+            {
+                openMode = NativeMethods.STGM.READ | NativeMethods.STGM.SHARE_EXCLUSIVE;
+                IStorage subStorage = storage.OpenStorage(storageName, IntPtr.Zero, (uint) openMode, IntPtr.Zero, 0);
+
+                try
+                {
+                    IStorage newStorage;
+                    openMode = NativeMethods.STGM.CREATE | NativeMethods.STGM.READWRITE | NativeMethods.STGM.SHARE_EXCLUSIVE;
+                    hr = NativeMethods.StgCreateDocfile(extractFile, (uint) openMode, 0, out newStorage);
+                    if (hr != 0)
+                    {
+                        Marshal.ThrowExceptionForHR(hr);
+                    }
+
+                    try
+                    {
+                        subStorage.CopyTo(0, IntPtr.Zero, IntPtr.Zero, newStorage);
+
+                        newStorage.Commit(0);
+                    }
+                    finally
+                    {
+                        Marshal.ReleaseComObject(newStorage);
+                    }
+                }
+                finally
+                {
+                    Marshal.ReleaseComObject(subStorage);
+                }
+            }
+            finally
+            {
+                Marshal.ReleaseComObject(storage);
+            }
+        }
+
+        private int FindColumn(string fieldName)
+        {
+            if (this.view == null)
+            {
+                throw new InvalidOperationException();
+            }
+            ColumnCollection columns = this.view.Columns;
+            for (int i = 0; i < columns.Count; i++)
+            {
+                if (columns[i].Name == fieldName)
+                {
+                    return i + 1;
+                }
+            }
+            throw new ArgumentOutOfRangeException("fieldName");
+        }
+
+        private void CheckRange(int field)
+        {
+            if (field < 0 || field > this.FieldCount)
+            {
+                throw new ArgumentOutOfRangeException("field");
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/RecordStream.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/RecordStream.cs
new file mode 100644
index 00000000..82e8fb46
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/RecordStream.cs
@@ -0,0 +1,92 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+
+    internal class RecordStream : Stream
+    {
+        private Record record;
+        private int field;
+        private long position;
+
+        internal RecordStream(Record record, int field)
+            : base()
+        {
+            this.record = record;
+            this.field = field;
+        }
+
+        public override bool CanRead { get { return true; } }
+        public override bool CanWrite { get { return false; } }
+        public override bool CanSeek { get { return false; } }
+
+        public override long Length
+        {
+            get
+            {
+                return this.record.GetDataSize(this.field);
+            }
+        }
+
+        public override long Position
+        {
+            get
+            {
+                return this.position;
+            }
+
+            set
+            {
+                throw new NotSupportedException();
+            }
+        }
+
+        public override long Seek(long offset, SeekOrigin origin)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void SetLength(long value)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override void Flush()
+        {
+            throw new NotSupportedException();
+        }
+
+        public override int Read(byte[] buffer, int offset, int count)
+        {
+            if (count > 0)
+            {
+                byte[] readBuffer = (offset == 0 ? buffer : new byte[count]);
+                uint ucount = (uint) count;
+                uint ret = RemotableNativeMethods.MsiRecordReadStream((int) this.record.Handle, (uint) this.field, buffer, ref ucount);
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                count = (int) ucount;
+                if (offset > 0)
+                {
+                    Array.Copy(readBuffer, 0, buffer, offset, count);
+                }
+                this.position += count;
+            }
+            return count;
+        }
+
+        public override void Write(byte[] array, int offset, int count)
+        {
+            throw new NotSupportedException();
+        }
+
+        public override string ToString()
+        {
+            return "[Binary data]";
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/RemotableNativeMethods.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/RemotableNativeMethods.cs
new file mode 100644
index 00000000..960fd15f
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/RemotableNativeMethods.cs
@@ -0,0 +1,1171 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Assigns ID numbers to the MSI APIs that are remotable.
+    /// </summary>
+    /// <remarks><p>
+    /// This enumeration MUST stay in sync with the
+    /// unmanaged equivalent in RemoteMsiSession.h!
+    /// </p></remarks>
+    internal enum RemoteMsiFunctionId
+    {
+        EndSession = 0,
+        MsiCloseHandle,
+        MsiCreateRecord,
+        MsiDatabaseGetPrimaryKeys,
+        MsiDatabaseIsTablePersistent,
+        MsiDatabaseOpenView,
+        MsiDoAction,
+        MsiEnumComponentCosts,
+        MsiEvaluateCondition,
+        MsiFormatRecord,
+        MsiGetActiveDatabase,
+        MsiGetComponentState,
+        MsiGetFeatureCost,
+        MsiGetFeatureState,
+        MsiGetFeatureValidStates,
+        MsiGetLanguage,
+        MsiGetLastErrorRecord,
+        MsiGetMode,
+        MsiGetProperty,
+        MsiGetSourcePath,
+        MsiGetSummaryInformation,
+        MsiGetTargetPath,
+        MsiProcessMessage,
+        MsiRecordClearData,
+        MsiRecordDataSize,
+        MsiRecordGetFieldCount,
+        MsiRecordGetInteger,
+        MsiRecordGetString,
+        MsiRecordIsNull,
+        MsiRecordReadStream,
+        MsiRecordSetInteger,
+        MsiRecordSetStream,
+        MsiRecordSetString,
+        MsiSequence,
+        MsiSetComponentState,
+        MsiSetFeatureAttributes,
+        MsiSetFeatureState,
+        MsiSetInstallLevel,
+        MsiSetMode,
+        MsiSetProperty,
+        MsiSetTargetPath,
+        MsiSummaryInfoGetProperty,
+        MsiVerifyDiskSpace,
+        MsiViewExecute,
+        MsiViewFetch,
+        MsiViewGetError,
+        MsiViewGetColumnInfo,
+        MsiViewModify,
+    }
+
+    /// <summary>
+    /// Defines the signature of the native function
+    /// in SfxCA.dll that implements the remoting call.
+    /// </summary>
+    internal delegate void MsiRemoteInvoke(
+        RemoteMsiFunctionId id,
+        [MarshalAs(UnmanagedType.SysInt)]
+        IntPtr request,
+        [MarshalAs(UnmanagedType.SysInt)]
+        out IntPtr response);
+
+    /// <summary>
+    /// Redirects native API calls to either the normal NativeMethods class
+    /// or to out-of-proc calls via the remoting channel.
+    /// </summary>
+    internal static class RemotableNativeMethods
+    {
+        private const int MAX_REQUEST_FIELDS = 4;
+        private static int requestFieldDataOffset;
+        private static int requestFieldSize;
+        
+        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
+        private static IntPtr requestBuf;
+
+        private static MsiRemoteInvoke remotingDelegate;
+
+        /// <summary>
+        /// Checks if the current process is using remoting to access the
+        /// MSI session and database APIs.
+        /// </summary>
+        internal static bool RemotingEnabled
+        {
+            get
+            {
+                return RemotableNativeMethods.remotingDelegate != null;
+            }
+        }
+
+        /// <summary>
+        /// Sets a delegate that is used to make remote API calls.
+        /// </summary>
+        /// <remarks><p>
+        /// The implementation of this delegate is provided by the
+        /// custom action host DLL.
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal static MsiRemoteInvoke RemotingDelegate
+        {
+            set
+            {
+                RemotableNativeMethods.remotingDelegate = value;
+
+                if (value != null && requestBuf == IntPtr.Zero)
+                {
+                    requestFieldDataOffset = Marshal.SizeOf(typeof(IntPtr));
+                    requestFieldSize = 2 * Marshal.SizeOf(typeof(IntPtr));
+                    RemotableNativeMethods.requestBuf = Marshal.AllocHGlobal(
+                        requestFieldSize * MAX_REQUEST_FIELDS);
+                }
+            }
+        }
+
+        internal static bool IsRemoteHandle(int handle)
+        {
+            return (handle & Int32.MinValue) != 0;
+        }
+
+        internal static int MakeRemoteHandle(int handle)
+        {
+            if (handle == 0)
+            {
+                return handle;
+            }
+
+            if (RemotableNativeMethods.IsRemoteHandle(handle))
+            {
+                throw new InvalidOperationException("Handle already has the remote bit set.");
+            }
+
+            return handle ^ Int32.MinValue;
+        }
+
+        internal static int GetRemoteHandle(int handle)
+        {
+            if (handle == 0)
+            {
+                return handle;
+            }
+            
+            if (!RemotableNativeMethods.IsRemoteHandle(handle))
+            {
+                throw new InvalidOperationException("Handle does not have the remote bit set.");
+            }
+
+            return handle ^ Int32.MinValue;
+        }
+
+        private static void ClearData(IntPtr buf)
+        {
+            for (int i = 0; i < MAX_REQUEST_FIELDS; i++)
+            {
+                Marshal.WriteInt32(buf, (i * requestFieldSize), (int) VarEnum.VT_NULL);
+                Marshal.WriteIntPtr(buf, (i * requestFieldSize) + requestFieldDataOffset, IntPtr.Zero);
+            }
+        }
+
+        private static void WriteInt(IntPtr buf, int field, int value)
+        {
+            Marshal.WriteInt32(buf, (field * requestFieldSize), (int) VarEnum.VT_I4);
+            Marshal.WriteInt32(buf, (field * requestFieldSize) + requestFieldDataOffset, value);
+        }
+
+        private static void WriteString(IntPtr buf, int field, string value)
+        {
+            if (value == null)
+            {
+                Marshal.WriteInt32(buf, (field * requestFieldSize), (int) VarEnum.VT_NULL);
+                Marshal.WriteIntPtr(buf, (field * requestFieldSize) + requestFieldDataOffset, IntPtr.Zero);
+            }
+            else
+            {
+                IntPtr stringPtr = Marshal.StringToHGlobalUni(value);
+                Marshal.WriteInt32(buf, (field * requestFieldSize), (int) VarEnum.VT_LPWSTR);
+                Marshal.WriteIntPtr(buf, (field * requestFieldSize) + requestFieldDataOffset, stringPtr);
+            }
+        }
+
+        private static int ReadInt(IntPtr buf, int field)
+        {
+            VarEnum vt = (VarEnum) Marshal.ReadInt32(buf, (field * requestFieldSize));
+            if (vt == VarEnum.VT_EMPTY)
+            {
+                return 0;
+            }
+            else if (vt != VarEnum.VT_I4 && vt != VarEnum.VT_UI4)
+            {
+                throw new InstallerException("Invalid data received from remote MSI function invocation.");
+            }
+            return Marshal.ReadInt32(buf, (field * requestFieldSize) + requestFieldDataOffset);
+        }
+
+        private static void ReadString(IntPtr buf, int field, StringBuilder szBuf, ref uint cchBuf)
+        {
+            VarEnum vt = (VarEnum) Marshal.ReadInt32(buf, (field * requestFieldSize));
+            if (vt == VarEnum.VT_NULL)
+            {
+                szBuf.Remove(0, szBuf.Length);
+                return;
+            }
+            else if (vt != VarEnum.VT_LPWSTR)
+            {
+                throw new InstallerException("Invalid data received from remote MSI function invocation.");
+            }
+
+            szBuf.Remove(0, szBuf.Length);
+            IntPtr strPtr = Marshal.ReadIntPtr(buf, (field * requestFieldSize) + requestFieldDataOffset);
+            string str = Marshal.PtrToStringUni(strPtr);
+            if (str != null)
+            {
+                szBuf.Append(str);
+            }
+            cchBuf = (uint) szBuf.Length;
+        }
+
+        private static void FreeString(IntPtr buf, int field)
+        {
+            IntPtr stringPtr = Marshal.ReadIntPtr(buf, (field * requestFieldSize) + requestFieldDataOffset);
+            if (stringPtr != IntPtr.Zero)
+            {
+                Marshal.FreeHGlobal(stringPtr);
+            }
+        }
+
+        private static void ReadStream(IntPtr buf, int field, byte[] sBuf, int count)
+        {
+            VarEnum vt = (VarEnum) Marshal.ReadInt32(buf, (field * requestFieldSize));
+            if (vt != VarEnum.VT_STREAM)
+            {
+                throw new InstallerException("Invalid data received from remote MSI function invocation.");
+            }
+
+            IntPtr sPtr = Marshal.ReadIntPtr(buf, (field * requestFieldSize) + requestFieldDataOffset);
+            Marshal.Copy(sPtr, sBuf, 0, count);
+        }
+
+        private static uint MsiFunc_III(RemoteMsiFunctionId id, int in1, int in2, int in3)
+        {
+            lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, in1);
+                WriteInt(requestBuf, 1, in2);
+                WriteInt(requestBuf, 2, in3);
+                IntPtr resp;
+                remotingDelegate(id, requestBuf, out resp);
+                return unchecked ((uint) ReadInt(resp, 0));
+            }
+        }
+
+        private static uint MsiFunc_IIS(RemoteMsiFunctionId id, int in1, int in2, string in3)
+        {
+            lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, in1);
+                WriteInt(requestBuf, 1, in2);
+                WriteString(requestBuf, 2, in3);
+                IntPtr resp;
+                remotingDelegate(id, requestBuf, out resp);
+                FreeString(requestBuf, 2);
+                return unchecked ((uint) ReadInt(resp, 0));
+            }
+        }
+
+        private static uint MsiFunc_ISI(RemoteMsiFunctionId id, int in1, string in2, int in3)
+        {
+            lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, in1);
+                WriteString(requestBuf, 1, in2);
+                WriteInt(requestBuf, 2, in3);
+                IntPtr resp;
+                remotingDelegate(id, requestBuf, out resp);
+                FreeString(requestBuf, 2);
+                return unchecked ((uint) ReadInt(resp, 0));
+            }
+        }
+
+        private static uint MsiFunc_ISS(RemoteMsiFunctionId id, int in1, string in2, string in3)
+        {
+            lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, in1);
+                WriteString(requestBuf, 1, in2);
+                WriteString(requestBuf, 2, in3);
+                IntPtr resp;
+                remotingDelegate(id, requestBuf, out resp);
+                FreeString(requestBuf, 1);
+                FreeString(requestBuf, 2);
+                return unchecked ((uint) ReadInt(resp, 0));
+            }
+        }
+
+        private static uint MsiFunc_II_I(RemoteMsiFunctionId id, int in1, int in2, out int out1)
+        {
+            lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, in1);
+                WriteInt(requestBuf, 1, in2);
+                IntPtr resp;
+                remotingDelegate(id, requestBuf, out resp);
+                uint ret = unchecked ((uint) ReadInt(resp, 0));
+                out1 = ReadInt(resp, 1);
+                return ret;
+            }
+        }
+
+        private static uint MsiFunc_ISII_I(RemoteMsiFunctionId id, int in1, string in2, int in3, int in4, out int out1)
+        {
+            lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, in1);
+                WriteString(requestBuf, 1, in2);
+                WriteInt(requestBuf, 2, in3);
+                WriteInt(requestBuf, 3, in4);
+                IntPtr resp;
+                remotingDelegate(id, requestBuf, out resp);
+                FreeString(requestBuf, 1);
+                uint ret = unchecked ((uint) ReadInt(resp, 0));
+                out1 = ReadInt(resp, 1);
+                return ret;
+            }
+        }
+
+        private static uint MsiFunc_IS_II(RemoteMsiFunctionId id, int in1, string in2, out int out1, out int out2)
+        {
+            lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, in1);
+                WriteString(requestBuf, 1, in2);
+                IntPtr resp;
+                remotingDelegate(id, requestBuf, out resp);
+                FreeString(requestBuf, 1);
+                uint ret = unchecked ((uint) ReadInt(resp, 0));
+                out1 = ReadInt(resp, 1);
+                out2 = ReadInt(resp, 2);
+                return ret;
+            }
+        }
+
+        private static uint MsiFunc_II_S(RemoteMsiFunctionId id, int in1, int in2, StringBuilder out1, ref uint cchOut1)
+        {
+            lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, in1);
+                WriteInt(requestBuf, 1, in2);
+                IntPtr resp;
+                remotingDelegate(id, requestBuf, out resp);
+                uint ret = unchecked ((uint) ReadInt(resp, 0));
+                if (ret == 0) ReadString(resp, 1, out1, ref cchOut1);
+                return ret;
+            }
+        }
+
+        private static uint MsiFunc_IS_S(RemoteMsiFunctionId id, int in1, string in2, StringBuilder out1, ref uint cchOut1)
+        {
+            lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, in1);
+                WriteString(requestBuf, 1, in2);
+                IntPtr resp;
+                remotingDelegate(id, requestBuf, out resp);
+                FreeString(requestBuf, 1);
+                uint ret = unchecked ((uint) ReadInt(resp, 0));
+                if (ret == 0) ReadString(resp, 1, out1, ref cchOut1);
+                return ret;
+            }
+        }
+
+        private static uint MsiFunc_ISII_SII(RemoteMsiFunctionId id, int in1, string in2, int in3, int in4, StringBuilder out1, ref uint cchOut1, out int out2, out int out3)
+        {
+            lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, in1);
+                WriteString(requestBuf, 1, in2);
+                WriteInt(requestBuf, 2, in3);
+                WriteInt(requestBuf, 3, in4);
+                IntPtr resp;
+                remotingDelegate(id, requestBuf, out resp);
+                FreeString(requestBuf, 1);
+                uint ret = unchecked ((uint) ReadInt(resp, 0));
+                if (ret == 0) ReadString(resp, 1, out1, ref cchOut1);
+                out2 = ReadInt(resp, 2);
+                out3 = ReadInt(resp, 3);
+                return ret;
+            }
+        }
+
+        internal static int MsiProcessMessage(int hInstall, uint eMessageType, int hRecord)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+            {
+                return NativeMethods.MsiProcessMessage(hInstall, eMessageType, hRecord);
+            }
+            else lock (remotingDelegate)
+            {
+                // I don't understand why, but this particular function doesn't work
+                // when using the static requestBuf -- some data doesn't make it through.
+                // But it works when a fresh buffer is allocated here every call.
+                IntPtr buf = Marshal.AllocHGlobal(
+                    requestFieldSize * MAX_REQUEST_FIELDS);
+                ClearData(buf);
+                WriteInt(buf, 0, RemotableNativeMethods.GetRemoteHandle(hInstall));
+                WriteInt(buf, 1, unchecked ((int) eMessageType));
+                WriteInt(buf, 2, RemotableNativeMethods.GetRemoteHandle(hRecord));
+                IntPtr resp;
+                remotingDelegate(RemoteMsiFunctionId.MsiProcessMessage, buf, out resp);
+                Marshal.FreeHGlobal(buf);
+                return ReadInt(resp, 0);
+            }
+        }
+
+        internal static uint MsiCloseHandle(int hAny)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hAny))
+                return NativeMethods.MsiCloseHandle(hAny);
+            else
+                return RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiCloseHandle, RemotableNativeMethods.GetRemoteHandle(hAny), 0, 0);
+        }
+
+        internal static uint MsiGetProperty(int hInstall, string szName, StringBuilder szValueBuf, ref uint cchValueBuf)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiGetProperty(hInstall, szName, szValueBuf, ref cchValueBuf);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_IS_S(
+                    RemoteMsiFunctionId.MsiGetProperty,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szName,
+                    szValueBuf,
+                    ref cchValueBuf);
+            }
+        }
+
+        internal static uint MsiSetProperty(int hInstall, string szName, string szValue)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiSetProperty(hInstall, szName, szValue);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISS(
+                    RemoteMsiFunctionId.MsiSetProperty,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szName,
+                    szValue);
+            }
+        }
+
+        internal static int MsiCreateRecord(uint cParams, int hAny)
+        {
+            // When remoting is enabled, we might need to create either a local or
+            // remote record, depending on the handle it is to have an affinity with.
+            // If no affinity handle is specified, create a remote record (the 99% case).
+            if (!RemotingEnabled ||
+                (hAny != 0 && !RemotableNativeMethods.IsRemoteHandle(hAny)))
+            {
+                return NativeMethods.MsiCreateRecord(cParams);
+            }
+            else
+            {
+                int hRecord = unchecked((int)RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiCreateRecord, (int) cParams, 0, 0));
+                return RemotableNativeMethods.MakeRemoteHandle(hRecord);
+            }
+        }
+
+        internal static uint MsiRecordGetFieldCount(int hRecord)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+                return NativeMethods.MsiRecordGetFieldCount(hRecord);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiRecordGetFieldCount,
+                    RemotableNativeMethods.GetRemoteHandle(hRecord),
+                    0,
+                    0);
+            }
+        }
+
+        internal static int MsiRecordGetInteger(int hRecord, uint iField)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+                return NativeMethods.MsiRecordGetInteger(hRecord, iField);
+            else
+            {
+                return unchecked ((int) RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiRecordGetInteger,
+                    RemotableNativeMethods.GetRemoteHandle(hRecord), 
+                    (int) iField, 
+                    0));
+            }
+        }
+
+        internal static uint MsiRecordGetString(int hRecord, uint iField, StringBuilder szValueBuf, ref uint cchValueBuf)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+            {
+                return NativeMethods.MsiRecordGetString(hRecord, iField, szValueBuf, ref cchValueBuf);
+            }
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_II_S(
+                    RemoteMsiFunctionId.MsiRecordGetString,
+                    RemotableNativeMethods.GetRemoteHandle(hRecord),
+                    (int) iField,
+                    szValueBuf,
+                    ref cchValueBuf);
+            }
+        }
+
+        internal static uint MsiRecordSetInteger(int hRecord, uint iField, int iValue)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+                return NativeMethods.MsiRecordSetInteger(hRecord, iField, iValue);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiRecordSetInteger,
+                    RemotableNativeMethods.GetRemoteHandle(hRecord),
+                    (int) iField,
+                    iValue);
+            }
+        }
+
+        internal static uint MsiRecordSetString(int hRecord, uint iField, string szValue)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+                return NativeMethods.MsiRecordSetString(hRecord, iField, szValue);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_IIS(
+                    RemoteMsiFunctionId.MsiRecordSetString,
+                    RemotableNativeMethods.GetRemoteHandle(hRecord),
+                    (int) iField,
+                    szValue);
+            }
+        }
+
+        internal static int MsiGetActiveDatabase(int hInstall)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiGetActiveDatabase(hInstall);
+            else
+            {
+                int hDatabase = (int)RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiGetActiveDatabase,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    0,
+                    0);
+                return RemotableNativeMethods.MakeRemoteHandle(hDatabase);
+            }
+        }
+
+        internal static uint MsiDatabaseOpenView(int hDatabase, string szQuery, out int hView)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hDatabase))
+                return NativeMethods.MsiDatabaseOpenView(hDatabase, szQuery, out hView);
+            else
+            {
+                uint err = RemotableNativeMethods.MsiFunc_ISII_I(
+                    RemoteMsiFunctionId.MsiDatabaseOpenView,
+                    RemotableNativeMethods.GetRemoteHandle(hDatabase),
+                    szQuery,
+                    0,
+                    0,
+                    out hView);
+                hView = RemotableNativeMethods.MakeRemoteHandle(hView);
+                return err;
+            }
+        }
+
+        internal static uint MsiViewExecute(int hView, int hRecord)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hView))
+                return NativeMethods.MsiViewExecute(hView, hRecord);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiViewExecute,
+                    RemotableNativeMethods.GetRemoteHandle(hView),
+                    RemotableNativeMethods.GetRemoteHandle(hRecord),
+                    0);
+            }
+        }
+
+        internal static uint MsiViewFetch(int hView, out int hRecord)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hView))
+                return NativeMethods.MsiViewFetch(hView, out hRecord);
+            else
+            {
+                uint err = RemotableNativeMethods.MsiFunc_II_I(
+                    RemoteMsiFunctionId.MsiViewFetch,
+                    RemotableNativeMethods.GetRemoteHandle(hView),
+                    0,
+                    out hRecord);
+                hRecord = RemotableNativeMethods.MakeRemoteHandle(hRecord);
+                return err;
+            }
+        }
+
+        internal static uint MsiViewModify(int hView, int iModifyMode, int hRecord)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hView))
+                return NativeMethods.MsiViewModify(hView, iModifyMode, hRecord);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiViewModify,
+                    RemotableNativeMethods.GetRemoteHandle(hView),
+                    iModifyMode,
+                    RemotableNativeMethods.GetRemoteHandle(hRecord));
+            }
+        }
+
+        internal static int MsiViewGetError(int hView, StringBuilder szColumnNameBuffer, ref uint cchBuf)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hView))
+                return NativeMethods.MsiViewGetError(hView, szColumnNameBuffer, ref cchBuf);
+            else
+            {
+                return unchecked ((int) RemotableNativeMethods.MsiFunc_II_S(
+                    RemoteMsiFunctionId.MsiViewGetError,
+                    RemotableNativeMethods.GetRemoteHandle(hView),
+                    0,
+                    szColumnNameBuffer,
+                    ref cchBuf));
+            }
+        }
+
+        internal static uint MsiViewGetColumnInfo(int hView, uint eColumnInfo, out int hRecord)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hView))
+                return NativeMethods.MsiViewGetColumnInfo(hView, eColumnInfo, out hRecord);
+            else
+            {
+                uint err = RemotableNativeMethods.MsiFunc_II_I(
+                    RemoteMsiFunctionId.MsiViewGetColumnInfo,
+                    RemotableNativeMethods.GetRemoteHandle(hView),
+                    (int) eColumnInfo,
+                    out hRecord);
+                hRecord = RemotableNativeMethods.MakeRemoteHandle(hRecord);
+                return err;
+            }
+        }
+
+        internal static uint MsiFormatRecord(int hInstall, int hRecord, StringBuilder szResultBuf, ref uint cchResultBuf)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+                return NativeMethods.MsiFormatRecord(hInstall, hRecord, szResultBuf, ref cchResultBuf);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_II_S(
+                    RemoteMsiFunctionId.MsiFormatRecord,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    RemotableNativeMethods.GetRemoteHandle(hRecord),
+                    szResultBuf,
+                    ref cchResultBuf);
+            }
+        }
+
+        internal static uint MsiRecordClearData(int hRecord)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+                return NativeMethods.MsiRecordClearData(hRecord);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiRecordClearData,
+                    RemotableNativeMethods.GetRemoteHandle(hRecord),
+                    0,
+                    0);
+            }
+        }
+
+        internal static bool MsiRecordIsNull(int hRecord, uint iField)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+                return NativeMethods.MsiRecordIsNull(hRecord, iField);
+            else
+            {
+                return 0 != RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiRecordIsNull,
+                    RemotableNativeMethods.GetRemoteHandle(hRecord),
+                    (int) iField,
+                    0);
+            }
+        }
+
+        internal static uint MsiDatabaseGetPrimaryKeys(int hDatabase, string szTableName, out int hRecord)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hDatabase))
+                return NativeMethods.MsiDatabaseGetPrimaryKeys(hDatabase, szTableName, out hRecord);
+            else
+            {
+                uint err = RemotableNativeMethods.MsiFunc_ISII_I(
+                    RemoteMsiFunctionId.MsiDatabaseGetPrimaryKeys,
+                    RemotableNativeMethods.GetRemoteHandle(hDatabase),
+                    szTableName,
+                    0,
+                    0,
+                    out hRecord);
+                hRecord = RemotableNativeMethods.MakeRemoteHandle(hRecord);
+                return err;
+            }
+        }
+
+        internal static uint MsiDatabaseIsTablePersistent(int hDatabase, string szTableName)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hDatabase))
+                return NativeMethods.MsiDatabaseIsTablePersistent(hDatabase, szTableName);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISI(
+                    RemoteMsiFunctionId.MsiDatabaseIsTablePersistent,
+                    RemotableNativeMethods.GetRemoteHandle(hDatabase),
+                    szTableName,
+                    0);
+            }
+        }
+
+        internal static uint MsiDoAction(int hInstall, string szAction)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiDoAction(hInstall, szAction);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISI(
+                    RemoteMsiFunctionId.MsiDoAction,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szAction,
+                    0);
+            }
+        }
+
+        internal static uint MsiEnumComponentCosts(int hInstall, string szComponent, uint dwIndex, int iState, StringBuilder lpDriveBuf, ref uint cchDriveBuf, out int iCost, out int iTempCost)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiEnumComponentCosts(hInstall, szComponent, dwIndex, iState, lpDriveBuf, ref cchDriveBuf, out iCost, out iTempCost);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISII_SII(
+                    RemoteMsiFunctionId.MsiEvaluateCondition,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szComponent, (int) dwIndex, iState, lpDriveBuf, ref cchDriveBuf, out iCost, out iTempCost);
+            }
+        }
+
+        internal static uint MsiEvaluateCondition(int hInstall, string szCondition)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiEvaluateCondition(hInstall, szCondition);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISI(
+                    RemoteMsiFunctionId.MsiEvaluateCondition,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szCondition,
+                    0);
+            }
+        }
+
+        internal static uint MsiGetComponentState(int hInstall, string szComponent, out int iInstalled, out int iAction)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiGetComponentState(hInstall, szComponent, out iInstalled, out iAction);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_IS_II(
+                    RemoteMsiFunctionId.MsiGetComponentState,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szComponent,
+                    out iInstalled,
+                    out iAction);
+            }
+        }
+
+        internal static uint MsiGetFeatureCost(int hInstall, string szFeature, int iCostTree, int iState, out int iCost)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiGetFeatureCost(hInstall, szFeature, iCostTree, iState, out iCost);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISII_I(
+                    RemoteMsiFunctionId.MsiGetFeatureCost,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szFeature,
+                    iCostTree,
+                    iState,
+                    out iCost);
+            }
+        }
+
+        internal static uint MsiGetFeatureState(int hInstall, string szFeature, out int iInstalled, out int iAction)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiGetFeatureState(hInstall, szFeature, out iInstalled, out iAction);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_IS_II(
+                    RemoteMsiFunctionId.MsiGetFeatureState,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szFeature,
+                    out iInstalled,
+                    out iAction);
+            }
+        }
+
+        internal static uint MsiGetFeatureValidStates(int hInstall, string szFeature, out uint dwInstalledState)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiGetFeatureValidStates(hInstall, szFeature, out dwInstalledState);
+            else
+            {
+                int iTemp;
+                uint ret = RemotableNativeMethods.MsiFunc_ISII_I(
+                    RemoteMsiFunctionId.MsiGetFeatureValidStates,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szFeature,
+                    0,
+                    0,
+                    out iTemp);
+                dwInstalledState = (uint) iTemp;
+                return ret;
+            }
+        }
+
+        internal static int MsiGetLanguage(int hInstall)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiGetLanguage(hInstall);
+            else
+            {
+                return unchecked((int)RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiGetLanguage,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    0,
+                    0));
+            }
+        }
+
+        internal static int MsiGetLastErrorRecord(int hAny)
+        {
+            // When remoting is enabled, we might need to create either a local or
+            // remote record, depending on the handle it is to have an affinity with.
+            // If no affinity handle is specified, create a remote record (the 99% case).
+            if (!RemotingEnabled ||
+                (hAny != 0 && !RemotableNativeMethods.IsRemoteHandle(hAny)))
+            {
+                return NativeMethods.MsiGetLastErrorRecord();
+            }
+            else
+            {
+                int hRecord = unchecked((int) RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiGetLastErrorRecord, 0, 0, 0));
+                return RemotableNativeMethods.MakeRemoteHandle(hRecord);
+            }
+        }
+
+        internal static bool MsiGetMode(int hInstall, uint iRunMode)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiGetMode(hInstall, iRunMode);
+            else
+            {
+                return 0 != RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiGetMode,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    (int) iRunMode,
+                    0);
+            }
+        }
+
+        internal static uint MsiGetSourcePath(int hInstall, string szFolder, StringBuilder szPathBuf, ref uint cchPathBuf)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiGetSourcePath(hInstall, szFolder, szPathBuf, ref cchPathBuf);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_IS_S(
+                    RemoteMsiFunctionId.MsiGetSourcePath,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szFolder,
+                    szPathBuf,
+                    ref cchPathBuf);
+            }
+        }
+
+        internal static uint MsiGetSummaryInformation(int hDatabase, string szDatabasePath, uint uiUpdateCount, out int hSummaryInfo)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hDatabase))
+                return NativeMethods.MsiGetSummaryInformation(hDatabase, szDatabasePath, uiUpdateCount, out hSummaryInfo);
+            else
+            {
+                uint err = RemotableNativeMethods.MsiFunc_ISII_I(
+                    RemoteMsiFunctionId.MsiGetSummaryInformation,
+                    RemotableNativeMethods.GetRemoteHandle(hDatabase),
+                    szDatabasePath,
+                    (int)uiUpdateCount,
+                    0,
+                    out hSummaryInfo);
+                hSummaryInfo = RemotableNativeMethods.MakeRemoteHandle(hSummaryInfo);
+                return err;
+            }
+        }
+
+        internal static uint MsiGetTargetPath(int hInstall, string szFolder, StringBuilder szPathBuf, ref uint cchPathBuf)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiGetTargetPath(hInstall, szFolder, szPathBuf, ref cchPathBuf);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_IS_S(
+                    RemoteMsiFunctionId.MsiGetTargetPath,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szFolder,
+                    szPathBuf,
+                    ref cchPathBuf);
+            }
+        }
+
+        internal static uint MsiRecordDataSize(int hRecord, uint iField)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+                return NativeMethods.MsiRecordDataSize(hRecord, iField);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiRecordDataSize,
+                    RemotableNativeMethods.GetRemoteHandle(hRecord),
+                    (int) iField, 0);
+                }
+        }
+
+        internal static uint MsiRecordReadStream(int hRecord, uint iField, byte[] szDataBuf, ref uint cbDataBuf)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+            {
+                return NativeMethods.MsiRecordReadStream(hRecord, iField, szDataBuf, ref cbDataBuf);
+            }
+            else lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                unchecked
+                {
+                    WriteInt(requestBuf, 0, RemotableNativeMethods.GetRemoteHandle(hRecord));
+                    WriteInt(requestBuf, 1, (int) iField);
+                    WriteInt(requestBuf, 2, (int) cbDataBuf);
+                    IntPtr resp;
+                    remotingDelegate(RemoteMsiFunctionId.MsiRecordReadStream, requestBuf, out resp);
+                    uint ret = (uint) ReadInt(resp, 0);
+                    if (ret == 0)
+                    {
+                        cbDataBuf = (uint) ReadInt(resp, 2);
+                        if (cbDataBuf > 0)
+                        {
+                            RemotableNativeMethods.ReadStream(resp, 1, szDataBuf, (int) cbDataBuf);
+                        }
+                    }
+                    return ret;
+                }
+            }
+        }
+
+        internal static uint MsiRecordSetStream(int hRecord, uint iField, string szFilePath)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hRecord))
+                return NativeMethods.MsiRecordSetStream(hRecord, iField, szFilePath);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_IIS(
+                    RemoteMsiFunctionId.MsiRecordSetStream,
+                    RemotableNativeMethods.GetRemoteHandle(hRecord),
+                    (int) iField,
+                    szFilePath);
+            }
+        }
+
+        internal static uint MsiSequence(int hInstall, string szTable, int iSequenceMode)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiSequence(hInstall, szTable, iSequenceMode);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISI(
+                    RemoteMsiFunctionId.MsiSequence,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szTable,
+                    iSequenceMode);
+            }
+        }
+
+        internal static uint MsiSetComponentState(int hInstall, string szComponent, int iState)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiSetComponentState(hInstall, szComponent, iState);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISI(
+                    RemoteMsiFunctionId.MsiSetComponentState,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szComponent,
+                    iState);
+            }
+        }
+
+        internal static uint MsiSetFeatureAttributes(int hInstall, string szFeature, uint dwAttributes)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiSetFeatureAttributes(hInstall, szFeature, dwAttributes);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISI(
+                    RemoteMsiFunctionId.MsiSetFeatureAttributes,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szFeature,
+                    (int) dwAttributes);
+            }
+        }
+
+        internal static uint MsiSetFeatureState(int hInstall, string szFeature, int iState)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiSetFeatureState(hInstall, szFeature, iState);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISI(
+                    RemoteMsiFunctionId.MsiSetFeatureState,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall), szFeature, iState);
+            }
+        }
+
+        internal static uint MsiSetInstallLevel(int hInstall, int iInstallLevel)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiSetInstallLevel(hInstall, iInstallLevel);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiSetInstallLevel,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    iInstallLevel,
+                    0);
+            }
+        }
+
+        internal static uint MsiSetMode(int hInstall, uint iRunMode, bool fState)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiSetMode(hInstall, iRunMode, fState);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiSetMode,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    (int) iRunMode,
+                    fState ? 1 : 0);
+            }
+        }
+
+        internal static uint MsiSetTargetPath(int hInstall, string szFolder, string szFolderPath)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiSetTargetPath(hInstall, szFolder, szFolderPath);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_ISS(
+                    RemoteMsiFunctionId.MsiSetTargetPath,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    szFolder,
+                    szFolderPath);
+            }
+        }
+
+        internal static uint MsiSummaryInfoGetProperty(int hSummaryInfo, uint uiProperty, out uint uiDataType, out int iValue, ref long ftValue, StringBuilder szValueBuf, ref uint cchValueBuf)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hSummaryInfo))
+            {
+                return NativeMethods.MsiSummaryInfoGetProperty(hSummaryInfo, uiProperty, out uiDataType, out iValue, ref ftValue, szValueBuf, ref cchValueBuf);
+            }
+            else lock (RemotableNativeMethods.remotingDelegate)
+            {
+                ClearData(requestBuf);
+                WriteInt(requestBuf, 0, RemotableNativeMethods.GetRemoteHandle(hSummaryInfo));
+                WriteInt(requestBuf, 1, (int) uiProperty);
+                IntPtr resp;
+                remotingDelegate(RemoteMsiFunctionId.MsiSummaryInfoGetProperty, requestBuf, out resp);
+                unchecked
+                {
+                    uint ret = (uint) ReadInt(resp, 0);
+                    if (ret == 0)
+                    {
+                        uiDataType = (uint) ReadInt(resp, 1);
+                        switch ((VarEnum) uiDataType)
+                        {
+                            case VarEnum.VT_I2:
+                            case VarEnum.VT_I4:
+                                iValue = ReadInt(resp, 2);
+                                break;
+
+                            case VarEnum.VT_FILETIME:
+                                uint ftHigh = (uint) ReadInt(resp, 2);
+                                uint ftLow = (uint) ReadInt(resp, 3);
+                                ftValue = ((long) ftHigh) << 32 | ((long) ftLow);
+                                iValue = 0;
+                                break;
+
+                            case VarEnum.VT_LPSTR:
+                                ReadString(resp, 2, szValueBuf, ref cchValueBuf);
+                                iValue = 0;
+                                break;
+
+                            default:
+                                iValue = 0;
+                                break;
+                        }
+                    }
+                    else
+                    {
+                        uiDataType = 0;
+                        iValue = 0;
+                    }
+                    return ret;
+                }
+            }
+        }
+
+        internal static uint MsiVerifyDiskSpace(int hInstall)
+        {
+            if (!RemotingEnabled || !RemotableNativeMethods.IsRemoteHandle(hInstall))
+                return NativeMethods.MsiVerifyDiskSpace(hInstall);
+            else
+            {
+                return RemotableNativeMethods.MsiFunc_III(
+                    RemoteMsiFunctionId.MsiVerifyDiskSpace,
+                    RemotableNativeMethods.GetRemoteHandle(hInstall),
+                    0,
+                    0);
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Session.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/Session.cs
new file mode 100644
index 00000000..875e49a6
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Session.cs
@@ -0,0 +1,946 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// The Session object controls the installation process. It opens the
+    /// install database, which contains the installation tables and data.
+    /// </summary>
+    /// <remarks><p>
+    /// This object is associated with a standard set of action functions,
+    /// each performing particular operations on data from one or more tables. Additional
+    /// custom actions may be added for particular product installations. The basic engine
+    /// function is a sequencer that fetches sequential records from a designated sequence
+    /// table, evaluates any specified condition expression, and executes the designated
+    /// action. Actions not recognized by the engine are deferred to the UI handler object
+    /// for processing, usually dialog box sequences.
+    /// </p><p>
+    /// Note that only one Session object can be opened by a single process.
+    /// </p></remarks>
+    public sealed class Session : InstallerHandle, IFormatProvider
+    {
+        private Database database;
+        private CustomActionData customActionData;
+        private bool sessionAccessValidated = false;
+
+        internal Session(IntPtr handle, bool ownsHandle)
+            : base(handle, ownsHandle)
+        {
+        }
+
+        /// <summary>
+        /// Gets the Database for the install session.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="InstallerException">the Database cannot be accessed</exception>
+        /// <remarks><p>
+        /// Normally there is no need to close this Database object.  The same object can be
+        /// used throughout the lifetime of the Session, and it will be closed when the Session
+        /// is closed.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetactivedatabase.asp">MsiGetActiveDatabase</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1065:DoNotRaiseExceptionsInUnexpectedLocations")]
+        public Database Database
+        {
+            get
+            {
+                if (this.database == null || this.database.IsClosed)
+                {
+                    lock (this.Sync)
+                    {
+                        if (this.database == null || this.database.IsClosed)
+                        {
+                            this.ValidateSessionAccess();
+
+                            int hDb = RemotableNativeMethods.MsiGetActiveDatabase((int) this.Handle);
+                            if (hDb == 0)
+                            {
+                                throw new InstallerException();
+                            }
+                            this.database = new Database((IntPtr) hDb, true, "", DatabaseOpenMode.ReadOnly);
+                        }
+                    }
+                }
+                return this.database;
+            }
+        }
+
+        /// <summary>
+        /// Gets the numeric language ID used by the current install session.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetlanguage.asp">MsiGetLanguage</a>
+        /// </p></remarks>
+        public int Language
+        {
+            get
+            {
+                return (int) RemotableNativeMethods.MsiGetLanguage((int) this.Handle);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the string value of a named installer property, as maintained by the
+        /// Session object in the in-memory Property table, or, if it is prefixed with a percent
+        /// sign (%), the value of a system environment variable for the current process.
+        /// </summary>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetproperty.asp">MsiGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetproperty.asp">MsiSetProperty</a>
+        /// </p></remarks>
+        public string this[string property]
+        {
+            get
+            {
+                if (String.IsNullOrEmpty(property))
+                {
+                    throw new ArgumentNullException("property");
+                }
+
+                if (!this.sessionAccessValidated &&
+                    !Session.NonImmediatePropertyNames.Contains(property))
+                {
+                    this.ValidateSessionAccess();
+                }
+
+                StringBuilder buf = new StringBuilder();
+                uint bufSize = 0;
+                uint ret = RemotableNativeMethods.MsiGetProperty((int) this.Handle, property, buf, ref bufSize);
+                if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                {
+                    buf.Capacity = (int) ++bufSize;
+                    ret = RemotableNativeMethods.MsiGetProperty((int) this.Handle, property, buf, ref bufSize);
+                }
+
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                return buf.ToString();
+            }
+
+            set
+            {
+                if (String.IsNullOrEmpty(property))
+                {
+                    throw new ArgumentNullException("property");
+                }
+
+                this.ValidateSessionAccess();
+
+                if (value == null)
+                {
+                    value = String.Empty;
+                }
+
+                uint ret = RemotableNativeMethods.MsiSetProperty((int) this.Handle, property, value);
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Creates a new Session object from an integer session handle.
+        /// </summary>
+        /// <param name="handle">Integer session handle</param>
+        /// <param name="ownsHandle">true to close the handle when this object is disposed or finalized</param>
+        /// <remarks><p>
+        /// This method is only provided for interop purposes.  A Session object
+        /// should normally be obtained by calling <see cref="Installer.OpenPackage(Database,bool)"/>
+        /// or <see cref="Installer.OpenProduct"/>.
+        /// </p></remarks>
+        public static Session FromHandle(IntPtr handle, bool ownsHandle)
+        {
+            return new Session(handle, ownsHandle);
+        }
+
+        /// <summary>
+        /// Performs any enabled logging operations and defers execution to the UI handler
+        /// object associated with the engine.
+        /// </summary>
+        /// <param name="messageType">Type of message to be processed</param>
+        /// <param name="record">Contains message-specific fields</param>
+        /// <returns>A message-dependent return value</returns>
+        /// <exception cref="InvalidHandleException">the Session or Record handle is invalid</exception>
+        /// <exception cref="ArgumentOutOfRangeException">an invalid message kind is specified</exception>
+        /// <exception cref="InstallCanceledException">the user exited the installation</exception>
+        /// <exception cref="InstallerException">the message-handler failed for an unknown reason</exception>
+        /// <remarks><p>
+        /// Logging may be selectively enabled for the various message types.
+        /// See the <see cref="Installer.EnableLog(InstallLogModes,string)"/> method.
+        /// </p><p>
+        /// If record field 0 contains a formatting string, it is used to format the data in
+        /// the other fields. Else if the message is an error, warning, or user message, an attempt
+        /// is made to find a message template in the Error table for the current database using the
+        /// error number found in field 1 of the record for message types and return values.
+        /// </p><p>
+        /// The <paramref name="messageType"/> parameter may also include message-box flags from
+        /// the following enumerations: System.Windows.Forms.MessageBoxButtons,
+        /// System.Windows.Forms.MessageBoxDefaultButton, System.Windows.Forms.MessageBoxIcon.  These
+        /// flags can be combined with the InstallMessage with a bitwise OR.
+        /// </p><p>
+        /// Note, this method never returns Cancel or Error values.  Instead, appropriate
+        /// exceptions are thrown in those cases.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiprocessmessage.asp">MsiProcessMessage</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public MessageResult Message(InstallMessage messageType, Record record)
+        {
+            if (record == null)
+            {
+                throw new ArgumentNullException("record");
+            }
+
+            int ret = RemotableNativeMethods.MsiProcessMessage((int) this.Handle, (uint) messageType, (int) record.Handle);
+            if (ret < 0)
+            {
+                throw new InstallerException();
+            }
+            else if (ret == (int) MessageResult.Cancel)
+            {
+                throw new InstallCanceledException();
+            }
+            return (MessageResult) ret;
+        }
+
+        /// <summary>
+        /// Writes a message to the log, if logging is enabled.
+        /// </summary>
+        /// <param name="msg">The line to be written to the log</param>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiprocessmessage.asp">MsiProcessMessage</a>
+        /// </p></remarks>
+        public void Log(string msg)
+        {
+            if (msg == null)
+            {
+                throw new ArgumentNullException("msg");
+            }
+
+            using (Record rec = new Record(0))
+            {
+                rec.FormatString = msg;
+                this.Message(InstallMessage.Info, rec);
+            }
+        }
+
+        /// <summary>
+        /// Writes a formatted message to the log, if logging is enabled.
+        /// </summary>
+        /// <param name="format">The line to be written to the log, containing 0 or more format specifiers</param>
+        /// <param name="args">An array containing 0 or more objects to be formatted</param>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiprocessmessage.asp">MsiProcessMessage</a>
+        /// </p></remarks>
+        public void Log(string format, params object[] args)
+        {
+            this.Log(String.Format(CultureInfo.InvariantCulture, format, args));
+        }
+
+        /// <summary>
+        /// Evaluates a logical expression containing symbols and values.
+        /// </summary>
+        /// <param name="condition">conditional expression</param>
+        /// <returns>The result of the condition evaluation</returns>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentNullException">the condition is null or empty</exception>
+        /// <exception cref="InvalidOperationException">the conditional expression is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msievaluatecondition.asp">MsiEvaluateCondition</a>
+        /// </p></remarks>
+        public bool EvaluateCondition(string condition)
+        {
+            if (String.IsNullOrEmpty(condition))
+            {
+                throw new ArgumentNullException("condition");
+            }
+
+            uint value = RemotableNativeMethods.MsiEvaluateCondition((int) this.Handle, condition);
+            if (value == 0)
+            {
+                return false;
+            }
+            else if (value == 1)
+            {
+                return true;
+            }
+            else
+            {
+                throw new InvalidOperationException();
+            }
+        }
+
+        /// <summary>
+        /// Evaluates a logical expression containing symbols and values, specifying a default
+        /// value to be returned in case the condition is empty.
+        /// </summary>
+        /// <param name="condition">conditional expression</param>
+        /// <param name="defaultValue">value to return if the condition is empty</param>
+        /// <returns>The result of the condition evaluation</returns>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="InvalidOperationException">the conditional expression is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msievaluatecondition.asp">MsiEvaluateCondition</a>
+        /// </p></remarks>
+        public bool EvaluateCondition(string condition, bool defaultValue)
+        {
+            if (condition == null)
+            {
+                throw new ArgumentNullException("condition");
+            }
+            else if (condition.Length == 0)
+            {
+                return defaultValue;
+            }
+            else
+            {
+                this.ValidateSessionAccess();
+                return this.EvaluateCondition(condition);
+            }
+        }
+
+        /// <summary>
+        /// Formats a string containing installer properties.
+        /// </summary>
+        /// <param name="format">A format string containing property tokens</param>
+        /// <returns>A formatted string containing property data</returns>
+        /// <exception cref="InvalidHandleException">the Record handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiformatrecord.asp">MsiFormatRecord</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1719:ParameterNamesShouldNotMatchMemberNames")]
+        public string Format(string format)
+        {
+            if (format == null)
+            {
+                throw new ArgumentNullException("format");
+            }
+
+            using (Record formatRec = new Record(0))
+            {
+                formatRec.FormatString = format;
+                return formatRec.ToString(this);
+            }
+        }
+
+        /// <summary>
+        /// Returns a formatted string from record data.
+        /// </summary>
+        /// <param name="record">Record object containing a template and data to be formatted.
+        /// The template string must be set in field 0 followed by any referenced data parameters.</param>
+        /// <returns>A formatted string containing the record data</returns>
+        /// <exception cref="InvalidHandleException">the Record handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiformatrecord.asp">MsiFormatRecord</a>
+        /// </p></remarks>
+        public string FormatRecord(Record record)
+        {
+            if (record == null)
+            {
+                throw new ArgumentNullException("record");
+            }
+
+            return record.ToString(this);
+        }
+
+        /// <summary>
+        /// Returns a formatted string from record data using a specified format.
+        /// </summary>
+        /// <param name="record">Record object containing a template and data to be formatted</param>
+        /// <param name="format">Format string to be used instead of field 0 of the Record</param>
+        /// <returns>A formatted string containing the record data</returns>
+        /// <exception cref="InvalidHandleException">the Record handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiformatrecord.asp">MsiFormatRecord</a>
+        /// </p></remarks>
+        [Obsolete("This method is obsolete because it has undesirable side-effects. As an alternative, set the Record's " +
+            "FormatString property separately before calling the FormatRecord() override that takes only the Record parameter.")]
+        public string FormatRecord(Record record, string format)
+        {
+            if (record == null)
+            {
+                throw new ArgumentNullException("record");
+            }
+
+            return record.ToString(format, this);
+        }
+
+        /// <summary>
+        /// Retrieves product properties (not session properties) from the product database.
+        /// </summary>
+        /// <returns>Value of the property, or an empty string if the property is not set.</returns>
+        /// <remarks><p>
+        /// Note this is not the correct method for getting ordinary session properties. For that,
+        /// see the indexer on the Session class.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetproductproperty.asp">MsiGetProductProperty</a>
+        /// </p></remarks>
+        public string GetProductProperty(string property)
+        {
+            if (String.IsNullOrEmpty(property))
+            {
+                throw new ArgumentNullException("property");
+            }
+
+            this.ValidateSessionAccess();
+
+            StringBuilder buf = new StringBuilder();
+            uint bufSize = (uint) buf.Capacity;
+            uint ret = NativeMethods.MsiGetProductProperty((int) this.Handle, property, buf, ref bufSize);
+            
+            if (ret == (uint) NativeMethods.Error.MORE_DATA)
+            {
+                buf.Capacity = (int) ++bufSize;
+                ret = NativeMethods.MsiGetProductProperty((int) this.Handle, property, buf, ref bufSize);
+            }
+
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return buf.ToString();
+        }
+
+        /// <summary>
+        /// Gets an accessor for components in the current session.
+        /// </summary>
+        public ComponentInfoCollection Components
+        {
+            get
+            {
+                this.ValidateSessionAccess();
+                return new ComponentInfoCollection(this);
+            }
+        }
+
+        /// <summary>
+        /// Gets an accessor for features in the current session.
+        /// </summary>
+        public FeatureInfoCollection Features
+        {
+            get
+            {
+                this.ValidateSessionAccess();
+                return new FeatureInfoCollection(this);
+            }
+        }
+
+        /// <summary>
+        /// Checks to see if sufficient disk space is present for the current installation.
+        /// </summary>
+        /// <returns>True if there is sufficient disk space; false otherwise.</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiverifydiskspace.asp">MsiVerifyDiskSpace</a>
+        /// </p></remarks>
+        public bool VerifyDiskSpace()
+        {
+            this.ValidateSessionAccess();
+
+            uint ret = RemotableNativeMethods.MsiVerifyDiskSpace((int)this.Handle);
+            if (ret == (uint) NativeMethods.Error.DISK_FULL)
+            {
+                return false;
+            }
+            else if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Gets the total disk space per drive required for the installation.
+        /// </summary>
+        /// <returns>A list of InstallCost structures, specifying the cost for each drive</returns>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msienumcomponentcosts.asp">MsiEnumComponentCosts</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
+        public IList<InstallCost> GetTotalCost()
+        {
+            this.ValidateSessionAccess();
+
+            IList<InstallCost> costs = new List<InstallCost>();
+            StringBuilder driveBuf = new StringBuilder(20);
+            for (uint i = 0; true; i++)
+            {
+                int cost, tempCost;
+                uint driveBufSize = (uint) driveBuf.Capacity;
+                uint ret = RemotableNativeMethods.MsiEnumComponentCosts(
+                    (int) this.Handle,
+                    null,
+                    i,
+                    (int) InstallState.Default,
+                    driveBuf,
+                    ref driveBufSize,
+                    out cost,
+                    out tempCost);
+                if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS) break;
+                if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                {
+                    driveBuf.Capacity = (int) ++driveBufSize;
+                    ret = RemotableNativeMethods.MsiEnumComponentCosts(
+                        (int) this.Handle,
+                        null,
+                        i,
+                        (int) InstallState.Default,
+                        driveBuf,
+                        ref driveBufSize,
+                        out cost,
+                        out tempCost);
+                }
+
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                costs.Add(new InstallCost(driveBuf.ToString(), cost * 512L, tempCost * 512L));
+            }
+            return costs;
+        }
+
+        /// <summary>
+        /// Gets the designated mode flag for the current install session.
+        /// </summary>
+        /// <param name="mode">The type of mode to be checked.</param>
+        /// <returns>The value of the designated mode flag.</returns>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentOutOfRangeException">an invalid mode flag was specified</exception>
+        /// <remarks><p>
+        /// Note that only the following run modes are available to read from
+        /// a deferred custom action:<list type="bullet">
+        /// <item><description><see cref="InstallRunMode.Scheduled"/></description></item>
+        /// <item><description><see cref="InstallRunMode.Rollback"/></description></item>
+        /// <item><description><see cref="InstallRunMode.Commit"/></description></item>
+        /// </list>
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetmode.asp">MsiGetMode</a>
+        /// </p></remarks>
+        public bool GetMode(InstallRunMode mode)
+        {
+            return RemotableNativeMethods.MsiGetMode((int) this.Handle, (uint) mode);
+        }
+
+        /// <summary>
+        /// Sets the designated mode flag for the current install session.
+        /// </summary>
+        /// <param name="mode">The type of mode to be set.</param>
+        /// <param name="value">The desired value of the mode.</param>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="ArgumentOutOfRangeException">an invalid mode flag was specified</exception>
+        /// <exception cref="InvalidOperationException">the mode cannot not be set</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetmode.asp">MsiSetMode</a>
+        /// </p></remarks>
+        public void SetMode(InstallRunMode mode, bool value)
+        {
+            this.ValidateSessionAccess();
+
+            uint ret = RemotableNativeMethods.MsiSetMode((int) this.Handle, (uint) mode, value);
+            if (ret != 0)
+            {
+                if (ret == (uint) NativeMethods.Error.ACCESS_DENIED)
+                {
+                    throw new InvalidOperationException();
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets the full path to the designated folder on the source media or server image.
+        /// </summary>
+        /// <exception cref="ArgumentException">the folder was not found in the Directory table</exception>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetsourcepath.asp">MsiGetSourcePath</a>
+        /// </p></remarks>
+        public string GetSourcePath(string directory)
+        {
+            if (String.IsNullOrEmpty(directory))
+            {
+                throw new ArgumentNullException("directory");
+            }
+
+            this.ValidateSessionAccess();
+
+            StringBuilder buf = new StringBuilder();
+            uint bufSize = 0;
+            uint ret = RemotableNativeMethods.MsiGetSourcePath((int) this.Handle, directory, buf, ref bufSize);
+            if (ret == (uint) NativeMethods.Error.MORE_DATA)
+            {
+                buf.Capacity = (int) ++bufSize;
+                ret = ret = RemotableNativeMethods.MsiGetSourcePath((int) this.Handle, directory, buf, ref bufSize);
+            }
+
+            if (ret != 0)
+            {
+                if (ret == (uint) NativeMethods.Error.DIRECTORY)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret, directory);
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+            return buf.ToString();
+        }
+
+        /// <summary>
+        /// Gets the full path to the designated folder on the installation target drive.
+        /// </summary>
+        /// <exception cref="ArgumentException">the folder was not found in the Directory table</exception>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigettargetpath.asp">MsiGetTargetPath</a>
+        /// </p></remarks>
+        public string GetTargetPath(string directory)
+        {
+            if (String.IsNullOrEmpty(directory))
+            {
+                throw new ArgumentNullException("directory");
+            }
+
+            this.ValidateSessionAccess();
+
+            StringBuilder buf = new StringBuilder();
+            uint bufSize = 0;
+            uint ret = RemotableNativeMethods.MsiGetTargetPath((int) this.Handle, directory, buf, ref bufSize);
+            if (ret == (uint) NativeMethods.Error.MORE_DATA)
+            {
+                buf.Capacity = (int) ++bufSize;
+                ret = ret = RemotableNativeMethods.MsiGetTargetPath((int) this.Handle, directory, buf, ref bufSize);
+            }
+
+            if (ret != 0)
+            {
+                if (ret == (uint) NativeMethods.Error.DIRECTORY)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret, directory);
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+            return buf.ToString();
+        }
+
+        /// <summary>
+        /// Sets the full path to the designated folder on the installation target drive.
+        /// </summary>
+        /// <exception cref="ArgumentException">the folder was not found in the Directory table</exception>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <remarks><p>
+        /// Setting the target path of a directory changes the path specification for the directory
+        /// in the in-memory Directory table. Also, the path specifications of all other path objects
+        /// in the table that are either subordinate or equivalent to the changed path are updated
+        /// to reflect the change. The properties for each affected path are also updated.
+        /// </p><p>
+        /// If an error occurs in this function, all updated paths and properties revert to
+        /// their previous values. Therefore, it is safe to treat errors returned by this function
+        /// as non-fatal.
+        /// </p><p>
+        /// Do not attempt to configure the target path if the components using those paths
+        /// are already installed for the current user or for a different user. Check the
+        /// ProductState property before setting the target path to determine if the product
+        /// containing this component is installed.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisettargetpath.asp">MsiSetTargetPath</a>
+        /// </p></remarks>
+        public void SetTargetPath(string directory, string value)
+        {
+            if (String.IsNullOrEmpty(directory))
+            {
+                throw new ArgumentNullException("directory");
+            }
+
+            if (value == null)
+            {
+                throw new ArgumentNullException("value");
+            }
+
+            this.ValidateSessionAccess();
+
+            uint ret = RemotableNativeMethods.MsiSetTargetPath((int) this.Handle, directory, value);
+            if (ret != 0)
+            {
+                if (ret == (uint) NativeMethods.Error.DIRECTORY)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret, directory);
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Sets the install level for the current installation to a specified value and
+        /// recalculates the Select and Installed states for all features in the Feature
+        /// table. Also sets the Action state of each component in the Component table based
+        /// on the new level.
+        /// </summary>
+        /// <param name="installLevel">New install level</param>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <remarks><p>
+        /// The SetInstallLevel method sets the following:<list type="bullet">
+        /// <item><description>The installation level for the current installation to a specified value</description></item>
+        /// <item><description>The Select and Installed states for all features in the Feature table</description></item>
+        /// <item><description>The Action state of each component in the Component table, based on the new level</description></item>
+        /// </list>
+        /// If 0 or a negative number is passed in the ilnstallLevel parameter,
+        /// the current installation level does not change, but all features are still
+        /// updated based on the current installation level.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisetinstalllevel.asp">MsiSetInstallLevel</a>
+        /// </p></remarks>
+        public void SetInstallLevel(int installLevel)
+        {
+            this.ValidateSessionAccess();
+
+            uint ret = RemotableNativeMethods.MsiSetInstallLevel((int) this.Handle, installLevel);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Executes a built-in action, custom action, or user-interface wizard action.
+        /// </summary>
+        /// <param name="action">Name of the action to execute.  Case-sensitive.</param>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="InstallCanceledException">the user exited the installation</exception>
+        /// <remarks><p>
+        /// The DoAction method executes the action that corresponds to the name supplied. If the
+        /// name is not recognized by the installer as a built-in action or as a custom action in
+        /// the CustomAction table, the name is passed to the user-interface handler object, which
+        /// can invoke a function or a dialog box. If a null action name is supplied, the installer
+        /// uses the upper-case value of the ACTION property as the action to perform. If no property
+        /// value is defined, the default action is performed, defined as "INSTALL".
+        /// </p><p>
+        /// Actions that update the system, such as the InstallFiles and WriteRegistryValues
+        /// actions, cannot be run by calling MsiDoAction. The exception to this rule is if DoAction
+        /// is called from a custom action that is scheduled in the InstallExecuteSequence table
+        /// between the InstallInitialize and InstallFinalize actions. Actions that do not update the
+        /// system, such as AppSearch or CostInitialize, can be called.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidoaction.asp">MsiDoAction</a>
+        /// </p></remarks>
+        public void DoAction(string action)
+        {
+            this.DoAction(action, null);
+        }
+
+        /// <summary>
+        /// Executes a built-in action, custom action, or user-interface wizard action.
+        /// </summary>
+        /// <param name="action">Name of the action to execute.  Case-sensitive.</param>
+        /// <param name="actionData">Optional data to be passed to a deferred custom action.</param>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="InstallCanceledException">the user exited the installation</exception>
+        /// <remarks><p>
+        /// The DoAction method executes the action that corresponds to the name supplied. If the
+        /// name is not recognized by the installer as a built-in action or as a custom action in
+        /// the CustomAction table, the name is passed to the user-interface handler object, which
+        /// can invoke a function or a dialog box. If a null action name is supplied, the installer
+        /// uses the upper-case value of the ACTION property as the action to perform. If no property
+        /// value is defined, the default action is performed, defined as "INSTALL".
+        /// </p><p>
+        /// Actions that update the system, such as the InstallFiles and WriteRegistryValues
+        /// actions, cannot be run by calling MsiDoAction. The exception to this rule is if DoAction
+        /// is called from a custom action that is scheduled in the InstallExecuteSequence table
+        /// between the InstallInitialize and InstallFinalize actions. Actions that do not update the
+        /// system, such as AppSearch or CostInitialize, can be called.
+        /// </p><p>
+        /// If the called action is a deferred, rollback, or commit custom action, then the supplied
+        /// <paramref name="actionData"/> will be available via the <see cref="CustomActionData"/>
+        /// property of that custom action's session.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msidoaction.asp">MsiDoAction</a>
+        /// </p></remarks>
+        public void DoAction(string action, CustomActionData actionData)
+        {
+            if (String.IsNullOrEmpty(action))
+            {
+                throw new ArgumentNullException("action");
+            }
+
+            this.ValidateSessionAccess();
+
+            if (actionData != null)
+            {
+                this[action] = actionData.ToString();
+            }
+
+            uint ret = RemotableNativeMethods.MsiDoAction((int) this.Handle, action);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Executes an action sequence described in the specified table.
+        /// </summary>
+        /// <param name="sequenceTable">Name of the table containing the action sequence.</param>
+        /// <exception cref="InvalidHandleException">the Session handle is invalid</exception>
+        /// <exception cref="InstallCanceledException">the user exited the installation</exception>
+        /// <remarks><p>
+        /// This method queries the specified table, ordering the actions by the numbers in the Sequence column.
+        /// For each row retrieved, an action is executed, provided that any supplied condition expression does
+        /// not evaluate to FALSE.
+        /// </p><p>
+        /// An action sequence containing any actions that update the system, such as the InstallFiles and
+        /// WriteRegistryValues actions, cannot be run by calling DoActionSequence. The exception to this rule is if
+        /// DoActionSequence is called from a custom action that is scheduled in the InstallExecuteSequence table
+        /// between the InstallInitialize and InstallFinalize actions. Actions that do not update the system, such
+        /// as AppSearch or CostInitialize, can be called.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisequence.asp">MsiSequence</a>
+        /// </p></remarks>
+        public void DoActionSequence(string sequenceTable)
+        {
+            if (String.IsNullOrEmpty(sequenceTable))
+            {
+                throw new ArgumentNullException("sequenceTable");
+            }
+
+            this.ValidateSessionAccess();
+
+            uint ret = RemotableNativeMethods.MsiSequence((int) this.Handle, sequenceTable, 0);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Gets custom action data for the session that was supplied by the caller.
+        /// </summary>
+        /// <seealso cref="DoAction(string,CustomActionData)"/>
+        public CustomActionData CustomActionData
+        {
+            get
+            {
+                if (this.customActionData == null)
+                {
+                    this.customActionData = new CustomActionData(this[CustomActionData.PropertyName]);
+                }
+
+                return this.customActionData;
+            }
+        }
+
+        /// <summary>
+        /// Implements formatting for <see cref="Record" /> data.
+        /// </summary>
+        /// <param name="formatType">Type of format object to get.</param>
+        /// <returns>The the current instance, if <paramref name="formatType"/> is the same type
+        /// as the current instance; otherwise, null.</returns>
+        object IFormatProvider.GetFormat(Type formatType)
+        {
+            return formatType == typeof(Session) ? this : null;
+        }
+
+        /// <summary>
+        /// Closes the session handle.  Also closes the active database handle, if it is open.
+        /// After closing a handle, further method calls may throw an <see cref="InvalidHandleException"/>.
+        /// </summary>
+        /// <param name="disposing">If true, the method has been called directly
+        /// or indirectly by a user's code, so managed and unmanaged resources will
+        /// be disposed. If false, only unmanaged resources will be disposed.</param>
+        protected override void Dispose(bool disposing)
+        {
+            try
+            {
+                if (disposing)
+                {
+                    if (this.database != null)
+                    {
+                        this.database.Dispose();
+                        this.database = null;
+                    }
+                }
+            }
+            finally
+            {
+                base.Dispose(disposing);
+            }
+        }
+
+        /// <summary>
+        /// Gets the (short) list of properties that are available from non-immediate custom actions.
+        /// </summary>
+        private static IList<string> NonImmediatePropertyNames
+        {
+            get
+            {
+                return new string[] {
+                    CustomActionData.PropertyName,
+                    "ProductCode",
+                    "UserSID"
+                };
+            }
+        }
+
+        /// <summary>
+        /// Throws an exception if the custom action is not able to access immedate session details.
+        /// </summary>
+        private void ValidateSessionAccess()
+        {
+            if (!this.sessionAccessValidated)
+            {
+                if (this.GetMode(InstallRunMode.Scheduled) ||
+                    this.GetMode(InstallRunMode.Rollback) ||
+                    this.GetMode(InstallRunMode.Commit))
+                {
+                    throw new InstallerException("Cannot access session details from a non-immediate custom action");
+                }
+
+                this.sessionAccessValidated = true;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/ShortcutTarget.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/ShortcutTarget.cs
new file mode 100644
index 00000000..4c043bf2
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/ShortcutTarget.cs
@@ -0,0 +1,104 @@
+// 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.Dtf.WindowsInstaller
+{
+    /// <summary>
+    /// Holds information about the target of a shortcut file.
+    /// </summary>
+    public struct ShortcutTarget
+    {
+        private string productCode;
+        private string feature;
+        private string componentCode;
+
+        internal ShortcutTarget(string productCode, string feature, string componentCode)
+        {
+            this.productCode = productCode;
+            this.feature = feature;
+            this.componentCode = componentCode;
+        }
+
+        /// <summary>
+        /// Gets the target product code of the shortcut, or null if not available.
+        /// </summary>
+        public string ProductCode
+        {
+            get
+            {
+                return this.productCode;
+            }
+        }
+
+        /// <summary>
+        /// Gets the name of the target feature of the shortcut, or null if not available.
+        /// </summary>
+        public string Feature
+        {
+            get
+            {
+                return this.feature;
+            }
+        }
+
+        /// <summary>
+        /// Gets the target component code of the shortcut, or null if not available.
+        /// </summary>
+        public string ComponentCode
+        {
+            get
+            {
+                return this.componentCode;
+            }
+        }
+
+        /// <summary>
+        /// Tests whether two shortcut targets have the same product code, feature, and/or component code.
+        /// </summary>
+        /// <param name="st1">The first shortcut target to compare.</param>
+        /// <param name="st2">The second shortcut target to compare.</param>
+        /// <returns>True if all parts of the targets are the same, else false.</returns>
+        public static bool operator ==(ShortcutTarget st1, ShortcutTarget st2)
+        {
+            return st1.Equals(st2);
+        }
+
+        /// <summary>
+        /// Tests whether two shortcut targets have the same product code, feature, and/or component code.
+        /// </summary>
+        /// <param name="st1">The first shortcut target to compare.</param>
+        /// <param name="st2">The second shortcut target to compare.</param>
+        /// <returns>True if any parts of the targets are different, else false.</returns>
+        public static bool operator !=(ShortcutTarget st1, ShortcutTarget st2)
+        {
+            return !st1.Equals(st2);
+        }
+
+        /// <summary>
+        /// Tests whether two shortcut targets have the same product code, feature, and/or component code.
+        /// </summary>
+        /// <param name="obj">The shortcut target to compare to the current object.</param>
+        /// <returns>True if <paramref name="obj"/> is a shortcut target and all parts of the targets are the same, else false.</returns>
+        public override bool Equals(object obj)
+        {
+            if (obj == null || obj.GetType() != typeof(ShortcutTarget))
+            {
+                return false;
+            }
+            ShortcutTarget st = (ShortcutTarget) obj;
+            return this.productCode == st.productCode
+                && this.feature == st.feature
+                && this.componentCode == st.componentCode;
+        }
+
+        /// <summary>
+        /// Generates a hash code using all parts of the shortcut target.
+        /// </summary>
+        /// <returns>An integer suitable for hashing the shortcut target.</returns>
+        public override int GetHashCode()
+        {
+            return (this.productCode != null ? this.productCode.GetHashCode() : 0)
+                ^ (this.feature != null ? this.feature.GetHashCode() : 0)
+                ^ (this.componentCode != null ? this.componentCode.GetHashCode() : 0);
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/SourceList.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/SourceList.cs
new file mode 100644
index 00000000..16ec22e8
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/SourceList.cs
@@ -0,0 +1,525 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// A list of sources for an installed product or patch.
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+    public class SourceList : ICollection<string>
+    {
+        private Installation installation;
+        private SourceMediaList mediaList;
+
+        internal SourceList(Installation installation)
+        {
+            this.installation = installation;
+        }
+
+        /// <summary>
+        /// Gets the list of disks registered for the media source of
+        /// the patch or product installation.
+        /// </summary>
+        public SourceMediaList MediaList
+        {
+            get
+            {
+                if (this.mediaList == null)
+                {
+                    this.mediaList = new SourceMediaList(this.installation);
+                }
+                return this.mediaList;
+            }
+        }
+
+        /// <summary>
+        /// Gets the number of network and URL sources in the list.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                int count = 0;
+                IEnumerator<string> e = this.GetEnumerator();
+                while (e.MoveNext())
+                {
+                    count++;
+                }
+                return count;
+            }
+        }
+
+        /// <summary>
+        /// Gets a boolean value indicating whether the list is read-only.
+        /// A SourceList is never read-only.
+        /// </summary>
+        /// <value>read-only status of the list</value>
+        public bool IsReadOnly
+        {
+            get { return false; }
+        }
+
+        /// <summary>
+        /// Adds a network or URL source to the source list of the installed product.
+        /// </summary>
+        /// <param name="item">Path to the source to be added. This parameter is
+        /// expected to contain only the path without the filename.</param>
+        /// <remarks><p>
+        /// If this method is called with a new source, the installer adds the source
+        /// to the end of the source list. 
+        /// </p><p>
+        /// If this method is called with a source already existing in the source
+        /// list, it has no effect.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistaddsource.asp">MsiSourceListAddSource</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistaddsourceex.asp">MsiSourceListAddSourceEx</a>
+        /// </p></remarks>
+        /// <seealso cref="Insert"/>
+        public void Add(string item)
+        {
+            if (!this.Contains(item))
+            {
+                this.Insert(item, 0);
+            }
+        }
+
+        /// <summary>
+        /// Adds or reorders a network or URL source for the product or patch.
+        /// </summary>
+        /// <param name="item">Path to the source to be added. This parameter is
+        /// expected to contain only the path without the filename.</param>
+        /// <param name="index">Specifies the priority order in which the source
+        /// will be inserted</param>
+        /// <remarks><p>
+        /// If this method is called with a new source and <paramref name="index"/>
+        /// is set to 0, the installer adds the source to the end of the source list. 
+        /// </p><p>
+        /// If this method is called with a source already existing in the source
+        /// list and <paramref name="index"/> is set to 0, the installer retains the
+        /// source's existing index.
+        /// </p><p>
+        /// If the method is called with an existing source in the source list
+        /// and <paramref name="index"/> is set to a non-zero value, the source is
+        /// removed from its current location in the list and inserted at the position
+        /// specified by Index, before any source that already exists at that position.
+        /// </p><p>
+        /// If the method is called with a new source and Index is set to a
+        /// non-zero value, the source is inserted at the position specified by
+        /// <paramref name="index"/>, before any source that already exists at
+        /// that position. The index value for all sources in the list after the
+        /// index specified by Index are updated to ensure unique index values and
+        /// the pre-existing order is guaranteed to remain unchanged.
+        /// </p><p>
+        /// If <paramref name="index"/> is greater than the number of sources
+        /// in the list, the source is placed at the end of the list with an index
+        /// value one larger than any existing source.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistaddsourceex.asp">MsiSourceListAddSourceEx</a>
+        /// </p></remarks>
+        public void Insert(string item, int index)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException("item");
+            }
+
+            NativeMethods.SourceType type = item.Contains("://") ? NativeMethods.SourceType.Url : NativeMethods.SourceType.Network;
+
+            uint ret = NativeMethods.MsiSourceListAddSourceEx(
+                this.installation.InstallationCode,
+                this.installation.UserSid,
+                this.installation.Context,
+                (uint) type | (uint) this.installation.InstallationType,
+                item,
+                (uint) index);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Clears sources of all types: network, url, and media.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistclearall.asp">MsiSourceListClearAll</a>
+        /// </p></remarks>
+        public void Clear()
+        {
+            this.ClearSourceType(NativeMethods.SourceType.Url);
+            this.ClearSourceType(NativeMethods.SourceType.Network);
+            this.MediaList.Clear();
+        }
+
+        /// <summary>
+        /// Removes all network sources from the list. URL sources are not affected.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistclearallex.asp">MsiSourceListClearAllEx</a>
+        /// </p></remarks>
+        public void ClearNetworkSources()
+        {
+            this.ClearSourceType(NativeMethods.SourceType.Network);
+        }
+
+        /// <summary>
+        /// Removes all URL sources from the list. Network sources are not affected.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistclearallex.asp">MsiSourceListClearAllEx</a>
+        /// </p></remarks>
+        public void ClearUrlSources()
+        {
+            this.ClearSourceType(NativeMethods.SourceType.Url);
+        }
+
+        /// <summary>
+        /// Checks if the specified source exists in the list.
+        /// </summary>
+        /// <param name="item">case-insensitive source to look for</param>
+        /// <returns>true if the source exists in the list, false otherwise</returns>
+        public bool Contains(string item)
+        {
+            if (String.IsNullOrEmpty(item))
+            {
+                throw new ArgumentNullException("item");
+            }
+
+            foreach (string s in this)
+            {
+                if (s.Equals(item, StringComparison.OrdinalIgnoreCase))
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// Copies the network and URL sources from this list into an array.
+        /// </summary>
+        /// <param name="array">destination array to be filed</param>
+        /// <param name="arrayIndex">offset into the destination array where copying begins</param>
+        public void CopyTo(string[] array, int arrayIndex)
+        {
+            foreach (string source in this)
+            {
+                array[arrayIndex++] = source;
+            }
+        }
+
+        /// <summary>
+        /// Removes a network or URL source.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistclearsource.asp">MsiSourceListClearSource</a>
+        /// </p></remarks>
+        public bool Remove(string item)
+        {
+            if (String.IsNullOrEmpty(item))
+            {
+                throw new ArgumentNullException("item");
+            }
+
+            NativeMethods.SourceType type = item.Contains("://") ? NativeMethods.SourceType.Url : NativeMethods.SourceType.Network;
+
+            uint ret = NativeMethods.MsiSourceListClearSource(
+                this.installation.InstallationCode,
+                this.installation.UserSid,
+                this.installation.Context,
+                (uint) type | (uint) this.installation.InstallationType,
+                item);
+            if (ret != 0)
+            {
+                // TODO: Figure out when to return false.
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Enumerates the network and URL sources in the source list of the patch or product installation.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistenumsources.asp">MsiSourceListEnumSources</a>
+        /// </p></remarks>
+        public IEnumerator<string> GetEnumerator()
+        {
+            StringBuilder sourceBuf = new StringBuilder(256);
+            uint sourceBufSize = (uint) sourceBuf.Capacity;
+            for (uint i = 0; true; i++)
+            {
+                uint ret = this.EnumSources(sourceBuf, i, NativeMethods.SourceType.Network);
+                if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS)
+                {
+                    break;
+                }
+                else if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                else
+                {
+                    yield return sourceBuf.ToString();
+                }
+            }
+
+            for (uint i = 0; true; i++)
+            {
+                uint ret = this.EnumSources(sourceBuf, i, NativeMethods.SourceType.Url);
+                if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS)
+                {
+                    break;
+                }
+                else if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+                else
+                {
+                    yield return sourceBuf.ToString();
+                }
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Forces the installer to search the source list for a valid
+        /// source the next time a source is required. For example, when the
+        /// installer performs an installation or reinstallation, or when it
+        /// requires the path for a component that is set to run from source.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistforceresolution.asp">MsiSourceListForceResolution</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistforceresolutionex.asp">MsiSourceListForceResolutionEx</a>
+        /// </p></remarks>
+        public void ForceResolution()
+        {
+            uint ret = NativeMethods.MsiSourceListForceResolutionEx(
+                this.installation.InstallationCode,
+                this.installation.UserSid,
+                this.installation.Context,
+                (uint) this.installation.InstallationType);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the path relative to the root of the installation media.
+        /// </summary>
+        public string MediaPackagePath
+        {
+            get
+            {
+                return this["MediaPackagePath"];
+            }
+            set
+            {
+                this["MediaPackagePath"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the prompt template that is used when prompting the user
+        /// for installation media.
+        /// </summary>
+        public string DiskPrompt
+        {
+            get
+            {
+                return this["DiskPrompt"];
+            }
+            set
+            {
+                this["DiskPrompt"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the most recently used source location for the product.
+        /// </summary>
+        public string LastUsedSource
+        {
+            get
+            {
+                return this["LastUsedSource"];
+            }
+            set
+            {
+                this["LastUsedSource"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the Windows Installer package or patch package
+        /// on the source.
+        /// </summary>
+        public string PackageName
+        {
+            get
+            {
+                return this["PackageName"];
+            }
+            set
+            {
+                this["PackageName"] = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets the type of the last-used source.
+        /// </summary>
+        /// <remarks><p>
+        /// <ul>
+        /// <li>&quot;n&quot; = network location</li>
+        /// <li>&quot;u&quot; = URL location</li>
+        /// <li>&quot;m&quot; = media location</li>
+        /// <li>(empty string) = no last used source</li>
+        /// </ul>
+        /// </p></remarks>
+        public string LastUsedType
+        {
+            get
+            {
+                return this["LastUsedType"];
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets source list information properties of a product or patch installation.
+        /// </summary>
+        /// <param name="property">The source list information property name.</param>
+        /// <exception cref="ArgumentOutOfRangeException">An unknown product, patch, or property was requested</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistgetinfo.asp">MsiSourceListGetInfo</a>
+        /// </p></remarks>
+        public string this[string property]
+        {
+            get
+            {
+                StringBuilder buf = new StringBuilder("");
+                uint bufSize = 0;
+                uint ret = NativeMethods.MsiSourceListGetInfo(
+                    this.installation.InstallationCode,
+                    this.installation.UserSid,
+                    this.installation.Context,
+                    (uint) this.installation.InstallationType,
+                    property,
+                    buf,
+                    ref bufSize);
+                if (ret != 0)
+                {
+                    if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                    {
+                        buf.Capacity = (int) ++bufSize;
+                        ret = NativeMethods.MsiSourceListGetInfo(
+                            this.installation.InstallationCode,
+                            this.installation.UserSid,
+                            this.installation.Context,
+                            (uint) this.installation.InstallationType,
+                            property,
+                            buf,
+                            ref bufSize);
+                    }
+
+                    if (ret != 0)
+                    {
+                        if (ret == (uint) NativeMethods.Error.UNKNOWN_PRODUCT ||
+                            ret == (uint) NativeMethods.Error.UNKNOWN_PROPERTY)
+                        {
+                            throw new ArgumentOutOfRangeException("property");
+                        }
+                        else
+                        {
+                            throw InstallerException.ExceptionFromReturnCode(ret);
+                        }
+                    }
+                }
+                return buf.ToString();
+            }
+            set
+            {
+                uint ret = NativeMethods.MsiSourceListSetInfo(
+                    this.installation.InstallationCode,
+                    this.installation.UserSid,
+                    this.installation.Context,
+                    (uint) this.installation.InstallationType,
+                    property,
+                    value);
+                if (ret != 0)
+                {
+                    if (ret == (uint) NativeMethods.Error.UNKNOWN_PRODUCT ||
+                        ret == (uint) NativeMethods.Error.UNKNOWN_PROPERTY)
+                    {
+                        throw new ArgumentOutOfRangeException("property");
+                    }
+                    else
+                    {
+                        throw InstallerException.ExceptionFromReturnCode(ret);
+                    }
+                }
+            }
+        }
+
+        private void ClearSourceType(NativeMethods.SourceType type)
+        {
+            uint ret = NativeMethods.MsiSourceListClearAllEx(
+                this.installation.InstallationCode,
+                this.installation.UserSid,
+                this.installation.Context,
+                (uint) type | (uint) this.installation.InstallationType);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        private uint EnumSources(StringBuilder sourceBuf, uint i, NativeMethods.SourceType sourceType)
+        {
+            int enumType = (this.installation.InstallationType | (int) sourceType);
+            uint sourceBufSize = (uint) sourceBuf.Capacity;
+            uint ret = NativeMethods.MsiSourceListEnumSources(
+                this.installation.InstallationCode,
+                this.installation.UserSid,
+                this.installation.Context,
+                (uint) enumType,
+                i,
+                sourceBuf,
+                ref sourceBufSize);
+            if (ret == (uint) NativeMethods.Error.MORE_DATA)
+            {
+                sourceBuf.Capacity = (int) ++sourceBufSize;
+                ret = NativeMethods.MsiSourceListEnumSources(
+                    this.installation.InstallationCode,
+                    this.installation.UserSid,
+                    this.installation.Context,
+                    (uint) enumType,
+                    i,
+                    sourceBuf,
+                    ref sourceBufSize);
+            }
+            return ret;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/SourceMediaList.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/SourceMediaList.cs
new file mode 100644
index 00000000..cf7b7ec5
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/SourceMediaList.cs
@@ -0,0 +1,229 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Text;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// A list of source media for an installed product or patch.
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+    public class SourceMediaList : ICollection<MediaDisk>
+    {
+        private Installation installation;
+
+        internal SourceMediaList(Installation installation)
+        {
+            this.installation = installation;
+        }
+
+        /// <summary>
+        /// Gets the number of source media in the list.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                int count = 0;
+                IEnumerator<MediaDisk> e = this.GetEnumerator();
+                while (e.MoveNext())
+                {
+                    count++;
+                }
+                return count;
+            }
+        }
+
+        /// <summary>
+        /// Gets a boolean value indicating whether the list is read-only.
+        /// A SourceMediaList is never read-only.
+        /// </summary>
+        /// <value>read-only status of the list</value>
+        public bool IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Adds or updates a disk of the media source for the product or patch.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistaddmediadisk.asp">MsiSourceListAddMediaDisk</a>
+        /// </p></remarks>
+        public void Add(MediaDisk item)
+        {
+            uint ret = NativeMethods.MsiSourceListAddMediaDisk(
+                this.installation.InstallationCode,
+                this.installation.UserSid,
+                this.installation.Context,
+                (uint) this.installation.InstallationType,
+                (uint) item.DiskId,
+                item.VolumeLabel,
+                item.DiskPrompt);
+
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Removes all source media from the list.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistclearallex.asp">MsiSourceListClearAllEx</a>
+        /// </p></remarks>
+        public void Clear()
+        {
+            uint ret = NativeMethods.MsiSourceListClearAllEx(
+                this.installation.InstallationCode,
+                this.installation.UserSid,
+                this.installation.Context,
+                (uint) NativeMethods.SourceType.Media | (uint) this.installation.InstallationType);
+
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Checks if the specified media disk id exists in the list.
+        /// </summary>
+        /// <param name="diskId">disk id of the media to look for</param>
+        /// <returns>true if the media exists in the list, false otherwise</returns>
+        public bool Contains(int diskId)
+        {
+            foreach (MediaDisk mediaDisk in this)
+            {
+                if (mediaDisk.DiskId == diskId)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        bool ICollection<MediaDisk>.Contains(MediaDisk mediaDisk)
+        {
+            return this.Contains(mediaDisk.DiskId);
+        }
+
+        /// <summary>
+        /// Copies the source media info from this list into an array.
+        /// </summary>
+        /// <param name="array">destination array to be filed</param>
+        /// <param name="arrayIndex">offset into the destination array where copying begins</param>
+        public void CopyTo(MediaDisk[] array, int arrayIndex)
+        {
+            foreach (MediaDisk mediaDisk in this)
+            {
+                array[arrayIndex++] = mediaDisk;
+            }
+        }
+
+        /// <summary>
+        /// Removes a specified disk from the set of registered disks.
+        /// </summary>
+        /// <param name="diskId">ID of the disk to remove</param>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistclearmediadisk.asp">MsiSourceListClearMediaDisk</a>
+        /// </p></remarks>
+        public bool Remove(int diskId)
+        {
+            uint ret = NativeMethods.MsiSourceListClearMediaDisk(
+                this.installation.InstallationCode,
+                this.installation.UserSid,
+                this.installation.Context,
+                (uint) this.installation.InstallationType,
+                (uint) diskId);
+
+            if (ret != 0)
+            {
+                // TODO: Figure out when to return false.
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return true;
+        }
+
+        bool ICollection<MediaDisk>.Remove(MediaDisk mediaDisk)
+        {
+            return this.Remove(mediaDisk.DiskId);
+        }
+
+        /// <summary>
+        /// Enumerates the source media in the source list of the patch or product installation.
+        /// </summary>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisourcelistenummediadisks.asp">MsiSourceListEnumMediaDisks</a>
+        /// </p></remarks>
+        public IEnumerator<MediaDisk> GetEnumerator()
+        {
+            uint diskId;
+            StringBuilder volumeBuf = new StringBuilder(40);
+            uint volumeBufSize = (uint) volumeBuf.Capacity;
+            StringBuilder promptBuf = new StringBuilder(80);
+            uint promptBufSize = (uint) promptBuf.Capacity;
+            for (uint i = 0; true; i++)
+            {
+                uint ret = NativeMethods.MsiSourceListEnumMediaDisks(
+                    this.installation.InstallationCode,
+                    this.installation.UserSid,
+                    this.installation.Context,
+                    (uint) this.installation.InstallationType,
+                    i,
+                    out diskId,
+                    volumeBuf,
+                    ref volumeBufSize,
+                    promptBuf,
+                    ref promptBufSize);
+
+                if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                {
+                    volumeBuf.Capacity = (int) ++volumeBufSize;
+                    promptBuf.Capacity = (int) ++promptBufSize;
+
+                    ret = NativeMethods.MsiSourceListEnumMediaDisks(
+                        this.installation.InstallationCode,
+                        this.installation.UserSid,
+                        this.installation.Context,
+                        (uint) this.installation.InstallationType,
+                        i,
+                        out diskId,
+                        volumeBuf,
+                        ref volumeBufSize,
+                        promptBuf,
+                        ref promptBufSize);
+                }
+
+                if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS)
+                {
+                    break;
+                }
+
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+
+                yield return new MediaDisk((int) diskId, volumeBuf.ToString(), promptBuf.ToString());
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/SummaryInfo.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/SummaryInfo.cs
new file mode 100644
index 00000000..4dbff93f
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/SummaryInfo.cs
@@ -0,0 +1,612 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Globalization;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// Provides access to summary information of a Windows Installer database.
+    /// </summary>
+    public class SummaryInfo : InstallerHandle
+    {
+        internal const int MAX_PROPERTIES = 20;
+
+        /// <summary>
+        /// Gets a SummaryInfo object that can be used to examine, update, and add
+        /// properties to the summary information stream of a package or transform.
+        /// </summary>
+        /// <param name="packagePath">Path to the package (database) or transform</param>
+        /// <param name="enableWrite">True to reserve resources for writing summary information properties.</param>
+        /// <exception cref="FileNotFoundException">the package does not exist or could not be read</exception>
+        /// <exception cref="InstallerException">the package is an invalid format</exception>
+        /// <remarks><p>
+        /// The SummaryInfo object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// It is best that the handle be closed manually as soon as it is no longer
+        /// needed, as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msigetsummaryinformation.asp">MsiGetSummaryInformation</a>
+        /// </p></remarks>
+        public SummaryInfo(string packagePath, bool enableWrite)
+            : base((IntPtr) SummaryInfo.OpenSummaryInfo(packagePath, enableWrite), true)
+        {
+        }
+
+        internal SummaryInfo(IntPtr handle, bool ownsHandle) : base(handle, ownsHandle)
+        {
+        }
+
+        /// <summary>Gets or sets the Title summary information property.</summary>
+        /// <remarks><p>
+        /// The Title summary information property briefly describes the type of installer package. Phrases
+        /// such as "Installation Database" or "Transform" or "Patch" may be used for this property.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public string Title
+        {
+            get { return this[2]; }
+            set { this[2] = value; }
+        }
+
+        /// <summary>Gets or sets the Subject summary information property.</summary>
+        /// <remarks><p>
+        /// The Subject summary information property conveys to a file browser the product that can be installed using
+        /// the logic and data in this installer database. For example, the value of the summary property for
+        /// Microsoft Office 97 would be "Microsoft Office 97 Professional". This value is typically set from the
+        /// installer property ProductName.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public string Subject
+        {
+            get { return this[3]; }
+            set { this[3] = value; }
+        }
+
+        /// <summary>Gets or sets the Author summary information property.</summary>
+        /// <remarks><p>
+        /// The Author summary information property conveys to a file browser the manufacturer of the installation
+        /// database. This value is typically set from the installer property Manufacturer.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public string Author
+        {
+            get { return this[4]; }
+            set { this[4] = value; }
+        }
+
+        /// <summary>Gets or sets the Keywords summary information property.</summary>
+        /// <remarks><p>
+        /// The Keywords summary information property is used by file browsers to hold keywords that permit the
+        /// database file to be found in a keyword search. The set of keywords typically includes "Installer" as
+        /// well as product-specific keywords, and may be localized.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public string Keywords
+        {
+            get { return this[5]; }
+            set { this[5] = value; }
+        }
+
+        /// <summary>Gets or sets the Comments summary information property.</summary>
+        /// <remarks><p>
+        /// The Comments summary information property conveys the general purpose of the installer database. By convention,
+        /// the value for this summary property is set to the following:
+        /// </p><p>
+        /// "This installer database contains the logic and data required to install &lt;product name&gt;."
+        /// </p><p>
+        /// where &lt;product name&gt; is the name of the product being installed. In general the value for this summary
+        /// property only changes in the product name, nothing else.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public string Comments
+        {
+            get { return this[6]; }
+            set { this[6] = value; }
+        }
+
+        /// <summary>Gets or sets the Template summary information property.</summary>
+        /// <remarks><p>
+        /// The Template summary information propery indicates the platform and language versions supported by the database.
+        /// </p><p>
+        /// The syntax of the Template Summary property information is:
+        /// [platform property][,platform property][,...];[language id][,language id][,...]
+        /// </p><p>
+        /// For example, the following are all valid values for the Template Summary property:
+        /// <list type="bullet">
+        /// <item>Intel;1033</item>
+        /// <item>Intel64;1033</item>
+        /// <item>;1033</item>
+        /// <item>;</item>
+        /// <item>Intel ;1033,2046</item>
+        /// <item>Intel64;1033,2046</item>
+        /// <item>Intel;0</item>
+        /// </list>
+        /// </p><p>
+        /// If this is a 64-bit Windows Installer, enter Intel64 in the Template summary information property. Note that an
+        /// installation package cannot have both the Intel and Intel64 properties set.
+        /// </p><p>
+        /// If the current platform does not match one of the platforms specified then the installer will not process the
+        /// package. Not specifying a platform implies that the package is platform-independent.
+        /// </p><p>
+        /// Entering 0 in the language ID field of the Template summary information property, or leaving this field empty,
+        /// indicates that the package is language neutral.
+        /// </p><p>
+        /// There are variations of this property depending on whether it is in a source installer database or a transform.
+        /// </p><p>
+        /// Source Installer Database - Only one language can be specified in a source installer database. Merge Modules are
+        /// the only packages that may have multiple languages. For more information, see Multiple Language Merge Modules.
+        /// </p><p>
+        /// Transform - In a transform file, only one language may be specified. The specified platform and language determine
+        /// whether a transform can be applied to a particular database. The platform property and the language property can
+        /// be left blank if no transform restriction relies on them to validate the transform.
+        /// </p><p>
+        /// This summary property is REQUIRED.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public string Template
+        {
+            get { return this[7]; }
+            set { this[7] = value; }
+        }
+
+        /// <summary>Gets or sets the LastSavedBy summary information property.</summary>
+        /// <remarks><p>
+        /// The installer sets the Last Saved By summary information property to the value of the LogonUser property during
+        /// an administrative installation. The installer never uses this property and a user never needs to modify it.
+        /// Developers of a database editing tool may use this property to track the last person to modify the database.
+        /// This property should be left set to null in a final shipping database.
+        /// </p><p>
+        /// In a transform, this summary property contains the platform and language ID(s) that a database should have
+        /// after it has been transformed. The property specifies to what the Template should be set in the new database.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public string LastSavedBy
+        {
+            get { return this[8]; }
+            set { this[8] = value; }
+        }
+
+        /// <summary>Gets or sets the RevisionNumber summary information property.</summary>
+        /// <remarks><p>
+        /// The Revision Number summary information property contains the package code for the installer package. The
+        /// package code is a unique identifier of the installer package. 
+        /// </p><p>
+        /// The Revision Number summary information  property of a patch package specifies the GUID patch code for
+        /// the patch. This is followed by a list of patch code GUIDs for obsolete patches that are removed when this
+        /// patch is applied. The patch codes are concatenated with no delimiters separating GUIDs in the list.
+        /// </p><p>
+        /// The Revision Number summary information  property of a transform package lists the product code GUIDs
+        /// and version of the new and original products and the upgrade code GUID. The list is separated with
+        /// semicolons as follows.
+        /// </p><p>
+        /// Original-Product-Code Original-Product-Version ; New-Product Code New-Product-Version; Upgrade-Code
+        /// </p><p>
+        /// This summary property is REQUIRED.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public string RevisionNumber
+        {
+            get { return this[9]; }
+            set { this[9] = value; }
+        }
+
+        /// <summary>Gets or sets the CreatingApp summary information property.</summary>
+        /// <remarks><p>
+        /// The CreatingApp summary information property conveys which application created the installer database.
+        /// In general the value for this summary property is the name of the software used to author this database.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public string CreatingApp
+        {
+            get { return this[18]; }
+            set { this[18] = value; }
+        }
+
+        /// <summary>Gets or sets the LastPrintTime summary information property.</summary>
+        /// <remarks><p>
+        /// The LastPrintTime summary information property can be set to the date and time during an administrative
+        /// installation to record when the administrative image was created. For non-administrative installations
+        /// this property is the same as the CreateTime summary information property.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public DateTime LastPrintTime
+        { 
+            get { return (DateTime) this[11, typeof(DateTime)]; }
+            set { this[11, typeof(DateTime)] = value; }
+        }
+
+        /// <summary>Gets or sets the CreateTime summary information property.</summary>
+        /// <remarks><p>
+        /// The CreateTime summary information property conveys when the installer database was created.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public DateTime CreateTime
+        {
+            get { return (DateTime) this[12, typeof(DateTime)]; }
+            set { this[12, typeof(DateTime)] = value; }
+        }
+
+        /// <summary>Gets or sets the LastSaveTime summary information property.</summary>
+        /// <remarks><p>
+        /// The LastSaveTime summary information property conveys when the last time the installer database was
+        /// modified. Each time a user changes an installation the value for this summary property is updated to
+        /// the current system time/date at the time the installer database was saved. Initially the value for
+        /// this summary property is set to null to indicate that no changes have yet been made.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public DateTime LastSaveTime
+        {
+            get { return (DateTime) this[13, typeof(DateTime)]; }
+            set { this[13, typeof(DateTime)] = value; }
+        }
+
+        /// <summary>Gets or sets the CodePage summary information property.</summary>
+        /// <remarks><p>
+        /// The Codepage summary information property is the numeric value of the ANSI code page used for any
+        /// strings that are stored in the summary information. Note that this is not the same code page for
+        /// strings in the installation database. The Codepage summary information property is used to translate
+        /// the strings in the summary information into Unicode when calling the Unicode API functions. The
+        /// Codepage summary information property must be set before any string properties are set in the
+        /// summary information.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public short CodePage
+        {
+            get { return (short) this[1, typeof(short)]; }
+            set { this[1, typeof(short)] = value; }
+        }
+
+        /// <summary>Gets or sets the PageCount summary information property.</summary>
+        /// <remarks><p>
+        /// For an installation package, the PageCount summary information property contains the minimum
+        /// installer version required. For Windows Installer version 1.0, this property must be set to the
+        /// integer 100. For 64-bit Windows Installer Packages, this property must be set to the integer 200.
+        /// </p><p>
+        /// For a transform package, the PageCount summary information property contains minimum installer
+        /// version required to process the transform. Set to the greater of the two PageCount summary information
+        /// property values belonging to the databases used to generate the transform.
+        /// </p><p>
+        /// The PageCount summary information property is set to null in patch packages.
+        /// </p><p>
+        /// This summary property is REQUIRED.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public int PageCount
+        {
+            get { return (int) this[14, typeof(int)]; }
+            set { this[14, typeof(int)] = value; }
+        }
+
+        /// <summary>Gets or sets the WordCount summary information property.</summary>
+        /// <remarks><p>
+        /// The WordCount summary information property indicates the type of source file image. If this property is
+        /// not present, it defaults to 0. Note that this property is stored in place of the standard Count property.
+        /// </p><p>
+        /// This property is a bit field. New bits may be added in the future. At present the following bits are
+        /// available:
+        /// <list type="bullet">
+        /// <item>Bit 0: 0 = long file names, 1 = short file names</item>
+        /// <item>Bit 1: 0 = source is uncompressed, 1 = source is compressed</item>
+        /// <item>Bit 2: 0 = source is original media, 1 = source is administrative installation</item>
+        /// <item>[MSI 4.0] Bit 3: 0 = elevated privileges can be required to install, 1 = elevated privileges are not required to install</item>
+        /// </list>
+        /// </p><p>
+        /// These are combined to give the WordCount summary information property one of the following values
+        /// indicating a type of source file image:
+        /// <list type="bullet">
+        /// <item>0 - Original source using long file names. Matches tree in Directory table.</item>
+        /// <item>1 - Original source using short file names. Matches tree in Directory table.</item>
+        /// <item>2 - Compressed source files using long file names. Matches cabinets and files in the Media table.</item>
+        /// <item>3 - Compressed source files using short file names. Matches cabinets and files in the Media table.</item>
+        /// <item>4 - Administrative image using long file names. Matches tree in Directory table.</item>
+        /// <item>5 - Administrative image using short file names. Matches tree in Directory table.</item>
+        /// </list>
+        /// </p><p>
+        /// Note that if the package is marked as compressed (bit 1 is set), the installer only installs files
+        /// located at the root of the source. In this case, even files marked as uncompressed in the File table must
+        /// be located at the root to be installed. To specify a source image that has both a cabinet file (compressed
+        /// files) and uncompressed files that match the tree in the Directory table, mark the package as uncompressed
+        /// by leaving bit 1 unset (value=0) in the WordCount summary information property and set
+        /// <see cref="FileAttributes.Compressed"/> (value=16384) in the Attributes column of the File table
+        /// for each file in the cabinet.
+        /// </p><p>
+        /// For a patch package, the WordCount summary information property specifies the patch engine that was used
+        /// to create the patch files. The default value is 1 and indicates that MSPATCH was used to create the patch
+        /// A value of "2" means that the patch is using smaller, optimized, files available only with Windows Installer
+        /// version 1.2 or later. A patch with a WordCount of "2" fails immediately if used with a Windows Installer
+        /// version earlier than 1.2. A patch with a WordCount of "3" fails immediately if used with a Windows Installer
+        /// version earlier than 2.0.
+        /// </p><p>
+        /// This summary property is REQUIRED.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public int WordCount
+        {
+            get { return (int) this[15, typeof(int)]; }
+            set { this[15, typeof(int)] = value; }
+        }
+
+        /// <summary>Gets or sets the CharacterCount summary information property.</summary>
+        /// <remarks><p>
+        /// The CharacterCount summary information property is only used in transforms. This part of the summary
+        /// information stream is divided into two 16-bit words. The upper word contains the transform validation
+        /// flags. The lower word contains the transform error condition flags.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public int CharacterCount
+        {
+            get { return (int) this[16, typeof(int)]; }
+            set { this[16, typeof(int)] = value; }
+        }
+
+        /// <summary>Gets or sets the Security summary information property.</summary>
+        /// <remarks><p>
+        /// The Security summary information property conveys whether the package should be opened as read-only. The database
+        /// editing tool should not modify a read-only enforced database and should issue a warning at attempts to modify a
+        /// read-only recommended database. The following values of this property are applicable to Windows Installer files:
+        /// <list type="bullet">
+        /// <item>0 - no restriction</item>
+        /// <item>2 - read only recommended</item>
+        /// <item>4 - read only enforced</item>
+        /// </list>
+        /// </p><p>
+        /// This property should be set to read-only recommended (2) for an installation database and to read-only
+        /// enforced (4) for a transform or patch.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfogetproperty.asp">MsiSummaryInfoGetProperty</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfosetproperty.asp">MsiSummaryInfoSetProperty</a>
+        /// </p></remarks>
+        public int Security
+        {
+            get { return (int) this[19, typeof(int)]; }
+            set { this[19, typeof(int)] = value; }
+        }
+
+        private object this[uint property, Type type]
+        {
+            get
+            {
+                uint dataType;
+                StringBuilder stringValue = new StringBuilder("");
+                uint bufSize = 0;
+                int intValue;
+                long timeValue = 0;
+
+                uint ret = RemotableNativeMethods.MsiSummaryInfoGetProperty(
+                    (int) this.Handle,
+                    property,
+                    out dataType,
+                    out intValue,
+                    ref timeValue,
+                    stringValue,
+                    ref bufSize);
+                if (ret != 0 && dataType != (uint) VarEnum.VT_LPSTR)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+
+                switch ((VarEnum) dataType)
+                {
+                    case VarEnum.VT_EMPTY:
+                    {
+                        if (type == typeof(DateTime))
+                        {
+                            return DateTime.MinValue;
+                        }
+                        else if (type == typeof(string))
+                        {
+                            return String.Empty;
+                        }
+                        else if (type == typeof(short))
+                        {
+                            return (short) 0;
+                        }
+                        else
+                        {
+                            return (int) 0;
+                        }
+                    }
+
+                    case VarEnum.VT_LPSTR:
+                    {
+                        if (ret == (uint) NativeMethods.Error.MORE_DATA)
+                        {
+                            stringValue.Capacity = (int) ++bufSize;
+                            ret = RemotableNativeMethods.MsiSummaryInfoGetProperty(
+                                (int) this.Handle,
+                                property,
+                                out dataType,
+                                out intValue,
+                                ref timeValue,
+                                stringValue,
+                                ref bufSize);
+                        }
+                        if (ret != 0)
+                        {
+                            throw InstallerException.ExceptionFromReturnCode(ret);
+                        }
+                        return stringValue.ToString();
+                    }
+
+                    case VarEnum.VT_I2:
+                    case VarEnum.VT_I4:
+                    {
+                        if (type == typeof(string))
+                        {
+                            return intValue.ToString(CultureInfo.InvariantCulture);
+                        }
+                        else if (type == typeof(short))
+                        {
+                            return (short) intValue;
+                        }
+                        else
+                        {
+                            return intValue;
+                        }
+                    }
+
+                    case VarEnum.VT_FILETIME:
+                    {
+                        if (type == typeof(string))
+                        {
+                            return DateTime.FromFileTime(timeValue).ToString(CultureInfo.InvariantCulture);
+                        }
+                        else
+                        {
+                            return DateTime.FromFileTime(timeValue);
+                        }
+                    }
+
+                    default:
+                    {
+                        throw new InstallerException();
+                    }
+                }
+            }
+
+            set
+            {
+                uint dataType = (uint) VarEnum.VT_NULL;
+                string stringValue = "";
+                int intValue = 0;
+                long timeValue = 0;
+
+                if (type == typeof(short))
+                {
+                    dataType = (uint) VarEnum.VT_I2;
+                    intValue = (int)(short) value;  // Double cast because value is a *boxed* short.
+                }
+                else if (type == typeof(int))
+                {
+                    dataType = (uint) VarEnum.VT_I4;
+                    intValue = (int) value;
+                }
+                else if (type == typeof(string))
+                {
+                    dataType = (uint) VarEnum.VT_LPSTR;
+                    stringValue = (string) value;
+                }
+                else // (type == typeof(DateTime))
+                {
+                    dataType = (uint) VarEnum.VT_FILETIME;
+                    timeValue = ((DateTime) value).ToFileTime();
+                }
+
+                uint ret = NativeMethods.MsiSummaryInfoSetProperty(
+                    (int) this.Handle,
+                    property,
+                    dataType,
+                    intValue,
+                    ref timeValue,
+                    stringValue);
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+        }
+
+        private string this[uint property]
+        {
+            get { return (string) this[property, typeof(string)]; }
+            set { this[property, typeof(string)] = value; }
+        }
+
+        /// <summary>
+        /// Formats and writes the previously stored properties into the standard summary information stream.
+        /// </summary>
+        /// <exception cref="InstallerException">The stream cannot be successfully written.</exception>
+        /// <remarks><p>
+        /// This method may only be called once after all the property values have been set. Properties may
+        /// still be read after the stream is written.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msisummaryinfopersist.asp">MsiSummaryInfoPersist</a>
+        /// </p></remarks>
+        public void Persist()
+        {
+            uint ret = NativeMethods.MsiSummaryInfoPersist((int) this.Handle);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        private static int OpenSummaryInfo(string packagePath, bool enableWrite)
+        {
+            int summaryInfoHandle;
+            int maxProperties = !enableWrite ? 0 : SummaryInfo.MAX_PROPERTIES;
+            uint ret = RemotableNativeMethods.MsiGetSummaryInformation(
+                0,
+                packagePath,
+                (uint) maxProperties,
+                out summaryInfoHandle);
+            if (ret != 0)
+            {
+                if (ret == (uint) NativeMethods.Error.FILE_NOT_FOUND ||
+                    ret == (uint) NativeMethods.Error.ACCESS_DENIED)
+                {
+                    throw new FileNotFoundException(null, packagePath);
+                }
+                else
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+            }
+            return summaryInfoHandle;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/TableCollection.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/TableCollection.cs
new file mode 100644
index 00000000..95176ea0
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/TableCollection.cs
@@ -0,0 +1,192 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Text;
+
+    /// <summary>
+    /// Contains information about all the tables in a Windows Installer database.
+    /// </summary>
+    public class TableCollection : ICollection<TableInfo>
+    {
+        private Database db;
+
+        internal TableCollection(Database db)
+        {
+            this.db = db;
+        }
+
+        /// <summary>
+        /// Gets the number of tables in the database.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return this.GetTables().Count;
+            }
+        }
+
+        /// <summary>
+        /// Gets a boolean value indicating whether the collection is read-only.
+        /// A TableCollection is read-only when the database is read-only.
+        /// </summary>
+        /// <value>read-only status of the collection</value>
+        public bool IsReadOnly
+        {
+            get
+            {
+                return this.db.IsReadOnly;
+            }
+        }
+
+        /// <summary>
+        /// Gets information about a given table.
+        /// </summary>
+        /// <param name="table">case-sensitive name of the table</param>
+        /// <returns>information about the requested table, or null if the table does not exist in the database</returns>
+        public TableInfo this[string table]
+        {
+            get
+            {
+                if (String.IsNullOrEmpty(table))
+                {
+                    throw new ArgumentNullException("table");
+                }
+
+                if (!this.Contains(table))
+                {
+                    return null;
+                }
+
+                return new TableInfo(this.db, table);
+            }
+        }
+
+        /// <summary>
+        /// Adds a new table to the database.
+        /// </summary>
+        /// <param name="item">information about the table to be added</param>
+        /// <exception cref="InvalidOperationException">a table with the same name already exists in the database</exception>
+        public void Add(TableInfo item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException("item");
+            }
+
+            if (this.Contains(item.Name))
+            {
+                throw new InvalidOperationException();
+            }
+
+            this.db.Execute(item.SqlCreateString);
+        }
+
+        /// <summary>
+        /// Removes all tables (and all data) from the database.
+        /// </summary>
+        public void Clear()
+        {
+            foreach (string table in this.GetTables())
+            {
+                this.Remove(table);
+            }
+        }
+
+        /// <summary>
+        /// Checks if the database contains a table with the given name.
+        /// </summary>
+        /// <param name="item">case-sensitive name of the table to search for</param>
+        /// <returns>True if the table exists, false otherwise.</returns>
+        public bool Contains(string item)
+        {
+            if (String.IsNullOrEmpty(item))
+            {
+                throw new ArgumentNullException("item");
+            }
+            uint ret = RemotableNativeMethods.MsiDatabaseIsTablePersistent((int) this.db.Handle, item);
+            if (ret == 3)  // MSICONDITION_ERROR
+            {
+                throw new InstallerException();
+            }
+            return ret != 2;  // MSICONDITION_NONE
+        }
+
+        bool ICollection<TableInfo>.Contains(TableInfo item)
+        {
+            return this.Contains(item.Name);
+        }
+
+        /// <summary>
+        /// Copies the table information from this collection into an array.
+        /// </summary>
+        /// <param name="array">destination array to be filed</param>
+        /// <param name="arrayIndex">offset into the destination array where copying begins</param>
+        public void CopyTo(TableInfo[] array, int arrayIndex)
+        {
+            if (array == null)
+            {
+                throw new ArgumentNullException("array");
+            }
+
+            foreach (string table in this.GetTables())
+            {
+                array[arrayIndex++] = new TableInfo(this.db, table);
+            }
+        }
+
+        /// <summary>
+        /// Removes a table from the database.
+        /// </summary>
+        /// <param name="item">case-sensitive name of the table to be removed</param>
+        /// <returns>true if the table was removed, false if the table did not exist</returns>
+        public bool Remove(string item)
+        {
+            if (String.IsNullOrEmpty(item))
+            {
+                throw new ArgumentNullException("item");
+            }
+
+            if (!this.Contains(item))
+            {
+                return false;
+            }
+            this.db.Execute("DROP TABLE `{0}`", item);
+            return true;
+        }
+
+        bool ICollection<TableInfo>.Remove(TableInfo item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException("item");
+            }
+
+            return this.Remove(item.Name);
+        }
+
+        /// <summary>
+        /// Enumerates the tables in the database.
+        /// </summary>
+        public IEnumerator<TableInfo> GetEnumerator()
+        {
+            foreach (string table in this.GetTables())
+            {
+                yield return new TableInfo(this.db, table);
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+
+        private IList<string> GetTables()
+        {
+            return this.db.ExecuteStringQuery("SELECT `Name` FROM `_Tables`");
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/TableInfo.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/TableInfo.cs
new file mode 100644
index 00000000..e5a850b0
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/TableInfo.cs
@@ -0,0 +1,264 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+
+    /// <summary>
+    /// Defines a table in an installation database.
+    /// </summary>
+    public class TableInfo
+    {
+        private string name;
+        private ColumnCollection columns;
+        private ReadOnlyCollection<string> primaryKeys;
+
+        /// <summary>
+        /// Creates a table definition.
+        /// </summary>
+        /// <param name="name">Name of the table.</param>
+        /// <param name="columns">Columns in the table.</param>
+        /// <param name="primaryKeys">The primary keys of the table.</param>
+        public TableInfo(string name, ICollection<ColumnInfo> columns, IList<string> primaryKeys)
+        {
+            if (String.IsNullOrEmpty(name))
+            {
+                throw new ArgumentNullException("name");
+            }
+
+            if (columns == null || columns.Count == 0)
+            {
+                throw new ArgumentNullException("columns");
+            }
+
+            if (primaryKeys == null || primaryKeys.Count == 0)
+            {
+                throw new ArgumentNullException("primaryKeys");
+            }
+
+            this.name = name;
+            this.columns = new ColumnCollection(columns);
+            this.primaryKeys = new List<string>(primaryKeys).AsReadOnly();
+            foreach (string primaryKey in this.primaryKeys)
+            {
+                if (!this.columns.Contains(primaryKey))
+                {
+                    throw new ArgumentOutOfRangeException("primaryKeys");
+                }
+            }
+        }
+
+        internal TableInfo(Database db, string name)
+        {
+            if (db == null)
+            {
+                throw new ArgumentNullException("db");
+            }
+
+            if (String.IsNullOrEmpty(name))
+            {
+                throw new ArgumentNullException("name");
+            }
+
+            this.name = name;
+
+            using (View columnsView = db.OpenView("SELECT * FROM `{0}`", name))
+            {
+                this.columns = new ColumnCollection(columnsView);
+            }
+
+            this.primaryKeys = new ReadOnlyCollection<string>(
+                TableInfo.GetTablePrimaryKeys(db, name));
+        }
+
+        /// <summary>
+        /// Gets the name of the table.
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return this.name;
+            }
+        }
+
+        /// <summary>
+        /// Gets information about the columns in this table.
+        /// </summary>
+        /// <remarks><p>
+        /// This property queries the database every time it is called,
+        /// to ensure the returned values are up-to-date. For best performance,
+        /// hold onto the returned collection if using it more than once.
+        /// </p></remarks>
+        public ColumnCollection Columns
+        {
+            get
+            {
+                return this.columns;
+            }
+        }
+
+        /// <summary>
+        /// Gets the names of the columns that are primary keys of the table.
+        /// </summary>
+        public IList<string> PrimaryKeys
+        {
+            get
+            {
+                return this.primaryKeys;
+            }
+        }
+
+        /// <summary>
+        /// Gets an SQL CREATE string that can be used to create the table.
+        /// </summary>
+        public string SqlCreateString
+        {
+            get
+            {
+                StringBuilder s = new StringBuilder("CREATE TABLE `");
+                s.Append(this.name);
+                s.Append("` (");
+                int count = 0;
+                foreach (ColumnInfo col in this.Columns)
+                {
+                    if (count > 0)
+                    {
+                        s.Append(", ");
+                    }
+                    s.Append(col.SqlCreateString);
+                    count++;
+                }
+                s.Append("  PRIMARY KEY ");
+                count = 0;
+                foreach (string key in this.PrimaryKeys)
+                {
+                    if (count > 0)
+                    {
+                        s.Append(", ");
+                    }
+                    s.AppendFormat("`{0}`", key);
+                    count++;
+                }
+                s.Append(')');
+                return s.ToString();
+            }
+        }
+
+        /// <summary>
+        /// Gets an SQL INSERT string that can be used insert a new record into the table.
+        /// </summary>
+        /// <remarks><p>
+        /// The values are expressed as question-mark tokens, to be supplied by the record.
+        /// </p></remarks>
+        public string SqlInsertString
+        {
+            get
+            {
+                StringBuilder s = new StringBuilder("INSERT INTO `");
+                s.Append(this.name);
+                s.Append("` (");
+                int count = 0;
+                foreach (ColumnInfo col in this.Columns)
+                {
+                    if (count > 0)
+                    {
+                        s.Append(", ");
+                    }
+
+                    s.AppendFormat("`{0}`", col.Name);
+                    count++;
+                }
+                s.Append(") VALUES (");
+                while (count > 0)
+                {
+                    count--;
+                    s.Append("?");
+
+                    if (count > 0)
+                    {
+                        s.Append(", ");
+                    }
+                }
+                s.Append(')');
+                return s.ToString();
+            }
+        }
+
+        /// <summary>
+        /// Gets an SQL SELECT string that can be used to select all columns of the table.
+        /// </summary>
+        /// <remarks><p>
+        /// The columns are listed explicitly in the SELECT string, as opposed to using "SELECT *".
+        /// </p></remarks>
+        public string SqlSelectString
+        {
+            get
+            {
+                StringBuilder s = new StringBuilder("SELECT ");
+                int count = 0;
+                foreach (ColumnInfo col in this.Columns)
+                {
+                    if (count > 0) s.Append(", ");
+                    s.AppendFormat("`{0}`", col.Name);
+                    count++;
+                }
+                s.AppendFormat(" FROM `{0}`", this.Name);
+                return s.ToString();
+            }
+        }
+
+        /// <summary>
+        /// Gets a string representation of the table.
+        /// </summary>
+        /// <returns>The name of the table.</returns>
+        public override string ToString()
+        {
+            return this.name;
+        }
+
+        private static IList<string> GetTablePrimaryKeys(Database db, string table)
+        {
+            if (table == "_Tables")
+            {
+                return new string[] { "Name" };
+            }
+            else if (table == "_Columns")
+            {
+                return new string[] { "Table", "Number" };
+            }
+            else if (table == "_Storages")
+            {
+                return new string[] { "Name" };
+            }
+            else if (table == "_Streams")
+            {
+                return new string[] { "Name" };
+            }
+            else
+            {
+                int hrec;
+                uint ret = RemotableNativeMethods.MsiDatabaseGetPrimaryKeys(
+                    (int) db.Handle, table, out hrec);
+                if (ret != 0)
+                {
+                    throw InstallerException.ExceptionFromReturnCode(ret);
+                }
+
+                using (Record rec = new Record((IntPtr) hrec, true, null))
+                {
+                    string[] keys = new string[rec.FieldCount];
+                    for (int i = 0; i < keys.Length; i++)
+                    {
+                        keys[i] = rec.GetString(i + 1);
+                    }
+
+                    return keys;
+                }
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/Transaction.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/Transaction.cs
new file mode 100644
index 00000000..798dc79e
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/Transaction.cs
@@ -0,0 +1,201 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+
+    /// <summary>
+    /// [MSI 4.5] Handle to a multi-session install transaction.
+    /// </summary>
+    /// <remarks><p>
+    /// Win32 MSI APIs:
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msibegintransaction.asp">MsiBeginTransaction</a>
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msijointransaction.asp">MsiJoinTransaction</a>
+    /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiendtransaction.asp">MsiEndTransaction</a>
+    /// </p></remarks>
+    public class Transaction : InstallerHandle
+    {
+        private string name;
+        private IntPtr ownerChangeEvent;
+        private IList<EventHandler<EventArgs>> ownerChangeListeners;
+
+        /// <summary>
+        /// [MSI 4.5] Begins transaction processing of a multi-package installation.
+        /// </summary>
+        /// <param name="name">Name of the multi-package installation.</param>
+        /// <param name="attributes">Select optional behavior when beginning the transaction.</param>
+        /// <exception cref="InstallerException">The transaction could not be initialized.</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msibegintransaction.asp">MsiBeginTransaction</a>
+        /// </p></remarks>
+        public Transaction(string name, TransactionAttributes attributes)
+            : this(name, Transaction.Begin(name, attributes), true)
+        {
+        }
+
+        /// <summary>
+        /// Internal constructor.
+        /// </summary>
+        /// <remarks>
+        /// The second parameter is an array in order to receive multiple values from the initialization method.
+        /// </remarks>
+        private Transaction(string name, IntPtr[] handles, bool ownsHandle)
+            : base(handles[0], ownsHandle)
+        {
+            this.name = name;
+            this.ownerChangeEvent = handles[1];
+            this.ownerChangeListeners = new List<EventHandler<EventArgs>>();
+        }
+
+        /// <summary>
+        /// Creates a new Transaction object from an integer handle.
+        /// </summary>
+        /// <param name="handle">Integer transaction handle</param>
+        /// <param name="ownsHandle">true to close the handle when this object is disposed</param>
+        public static Transaction FromHandle(IntPtr handle, bool ownsHandle)
+        {
+            return new Transaction(handle.ToString(), new IntPtr[] { handle, IntPtr.Zero }, ownsHandle);
+        }
+
+        /// <summary>
+        /// Gets the name of the transaction.
+        /// </summary>
+        public string Name
+        {
+            get
+            {
+                return name;
+            }
+        }
+
+        /// <summary>
+        /// Notifies listeners when the process that owns the transaction changed.
+        /// </summary>
+        public event EventHandler<EventArgs> OwnerChanged
+        {
+            add
+            {
+                this.ownerChangeListeners.Add(value);
+
+                if (this.ownerChangeEvent != IntPtr.Zero && this.ownerChangeListeners.Count == 1)
+                {
+                    new Thread(this.WaitForOwnerChange).Start();
+                }
+            }
+            remove
+            {
+                this.ownerChangeListeners.Remove(value);
+            }
+        }
+
+        private void OnOwnerChanged()
+        {
+            EventArgs e = new EventArgs();
+            foreach (EventHandler<EventArgs> handler in this.ownerChangeListeners)
+            {
+                handler(this, e);
+            }
+        }
+
+        private void WaitForOwnerChange()
+        {
+            int ret = NativeMethods.WaitForSingleObject(this.ownerChangeEvent, -1);
+            if (ret == 0)
+            {
+                this.OnOwnerChanged();
+            }
+            else
+            {
+                throw new InstallerException();
+            }
+        }
+
+        /// <summary>
+        /// Makes the current process the owner of the multi-package installation transaction.
+        /// </summary>
+        /// <param name="attributes">Select optional behavior when joining the transaction.</param>
+        /// <exception cref="InvalidHandleException">The transaction handle is not valid.</exception>
+        /// <exception cref="InstallerException">The transaction could not be joined.</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msijointransaction.asp">MsiJoinTransaction</a>
+        /// </p></remarks>
+        public void Join(TransactionAttributes attributes)
+        {
+            IntPtr hChangeOfOwnerEvent;
+            uint ret = NativeMethods.MsiJoinTransaction((int) this.Handle, (int) attributes, out hChangeOfOwnerEvent);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+
+            this.ownerChangeEvent = hChangeOfOwnerEvent;
+            if (this.ownerChangeEvent != IntPtr.Zero && this.ownerChangeListeners.Count >= 1)
+            {
+                new Thread(this.WaitForOwnerChange).Start();
+            }
+        }
+
+        /// <summary>
+        /// Ends the install transaction and commits all changes to the system belonging to the transaction.
+        /// </summary>
+        /// <exception cref="InstallerException">The transaction could not be committed.</exception>
+        /// <remarks><p>
+        /// Runs any Commit Custom Actions and commits to the system any changes to Win32 or common language
+        /// runtime assemblies. Deletes the rollback script, and after using this option, the transaction's
+        /// changes can no longer be undone with a Rollback Installation.
+        /// </p><p>
+        /// This method can only be called by the current owner of the transaction.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiendtransaction.asp">MsiEndTransaction</a>
+        /// </p></remarks>
+        public void Commit()
+        {
+            this.End(true);
+        }
+
+        /// <summary>
+        /// Ends the install transaction and undoes changes to the system belonging to the transaction.
+        /// </summary>
+        /// <exception cref="InstallerException">The transaction could not be rolled back.</exception>
+        /// <remarks><p>
+        /// This method can only be called by the current owner of the transaction.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiendtransaction.asp">MsiEndTransaction</a>
+        /// </p></remarks>
+        public void Rollback()
+        {
+            this.End(false);
+        }
+
+        private static IntPtr[] Begin(string transactionName, TransactionAttributes attributes)
+        {
+            int hTransaction;
+            IntPtr hChangeOfOwnerEvent;
+            uint ret = NativeMethods.MsiBeginTransaction(transactionName, (int) attributes, out hTransaction, out hChangeOfOwnerEvent);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+
+            return new IntPtr[] { (IntPtr) hTransaction, hChangeOfOwnerEvent };
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic")]
+        private void End(bool commit)
+        {
+            uint ret = NativeMethods.MsiEndTransaction(commit ? 1 : 0);
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/ValidationErrorInfo.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/ValidationErrorInfo.cs
new file mode 100644
index 00000000..3f75326e
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/ValidationErrorInfo.cs
@@ -0,0 +1,46 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Contains specific information about an error encountered by the <see cref="View.Validate"/>,
+    /// <see cref="View.ValidateNew"/>, or <see cref="View.ValidateFields"/> methods of the
+    /// <see cref="View"/> class.
+    /// </summary>
+    [SuppressMessage("Microsoft.Performance", "CA1815:OverrideEqualsAndOperatorEqualsOnValueTypes")]
+    public struct ValidationErrorInfo
+    {
+        private ValidationError error;
+        private string column;
+        
+        internal ValidationErrorInfo(ValidationError error, string column)
+        {
+            this.error = error;
+            this.column = column;
+        }
+
+        /// <summary>
+        /// Gets the type of validation error encountered.
+        /// </summary>
+        public ValidationError Error
+        {
+            get
+            {
+                return this.error;
+            }
+        }
+
+        /// <summary>
+        /// Gets the column containing the error, or null if the error applies to the whole row.
+        /// </summary>
+        public string Column
+        {
+            get
+            {
+                return this.column;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/View.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/View.cs
new file mode 100644
index 00000000..21e8543e
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/View.cs
@@ -0,0 +1,625 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// A View represents a result set obtained when processing a query using the
+    /// <see cref="WixToolset.Dtf.WindowsInstaller.Database.OpenView"/> method of a
+    /// <see cref="Database"/>. Before any data can be transferred,
+    /// the query must be executed using the <see cref="Execute(Record)"/> method, passing to
+    /// it all replaceable parameters designated within the SQL query string.
+    /// </summary>
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+    public class View : InstallerHandle, IEnumerable<Record>
+    {
+        private Database database;
+        private string sql;
+        private IList<TableInfo> tables;
+        private ColumnCollection columns;
+
+        internal View(IntPtr handle, string sql, Database database)
+            : base(handle, true)
+        {
+            this.sql = sql;
+            this.database = database;
+        }
+
+        /// <summary>
+        /// Gets the Database on which this View was opened.
+        /// </summary>
+        public Database Database
+        {
+            get { return this.database; }
+        }
+
+        /// <summary>
+        /// Gets the SQL query string used to open this View.
+        /// </summary>
+        public string QueryString
+        {
+            get { return this.sql; }
+        }
+
+        /// <summary>
+        /// Gets the set of tables that were included in the SQL query for this View.
+        /// </summary>
+        public IList<TableInfo> Tables
+        {
+            get
+            {
+                if (this.tables == null)
+                {
+                    if (this.sql == null)
+                    {
+                        return null;
+                    }
+
+                    // Parse the table names out of the SQL query string by looking
+                    // for tokens that can come before or after the list of tables.
+
+                    string parseSql = this.sql.Replace('\t', ' ').Replace('\r', ' ').Replace('\n', ' ');
+                    string upperSql = parseSql.ToUpper(CultureInfo.InvariantCulture);
+
+                    string[] prefixes = new string[] { " FROM ", " INTO ", " TABLE " };
+                    string[] suffixes = new string[] { " WHERE ", " ORDER ", " SET ", " (", " ADD " };
+
+                    int index;
+
+                    for (int i = 0; i < prefixes.Length; i++)
+                    {
+                        if ((index = upperSql.IndexOf(prefixes[i], StringComparison.Ordinal)) > 0)
+                        {
+                            parseSql = parseSql.Substring(index + prefixes[i].Length);
+                            upperSql = upperSql.Substring(index + prefixes[i].Length);
+                        }
+                    }
+
+                    if (upperSql.StartsWith("UPDATE ", StringComparison.Ordinal))
+                    {
+                        parseSql = parseSql.Substring(7);
+                        upperSql = upperSql.Substring(7);
+                    }
+
+                    for (int i = 0; i < suffixes.Length; i++)
+                    {
+                        if ((index = upperSql.IndexOf(suffixes[i], StringComparison.Ordinal)) > 0)
+                        {
+                            parseSql = parseSql.Substring(0, index);
+                            upperSql = upperSql.Substring(0, index);
+                        }
+                    }
+
+                    if (upperSql.EndsWith(" HOLD", StringComparison.Ordinal) ||
+                        upperSql.EndsWith(" FREE", StringComparison.Ordinal))
+                    {
+                        parseSql = parseSql.Substring(0, parseSql.Length - 5);
+                        upperSql = upperSql.Substring(0, upperSql.Length - 5);
+                    }
+
+                    // At this point we should be left with a comma-separated list of table names,
+                    // optionally quoted with grave accent marks (`).
+
+                    string[] tableNames = parseSql.Split(',');
+                    IList<TableInfo> tableList = new List<TableInfo>(tableNames.Length);
+                    for (int i = 0; i < tableNames.Length; i++)
+                    {
+                        string tableName = tableNames[i].Trim(' ', '`');
+                        tableList.Add(new TableInfo(this.database, tableName));
+                    }
+                    this.tables = tableList;
+                }
+                return new List<TableInfo>(this.tables);
+            }
+        }
+
+        /// <summary>
+        /// Gets the set of columns that were included in the query for this View,
+        /// or null if this view is not a SELECT query.
+        /// </summary>
+        /// <exception cref="InstallerException">the View is not in an active state</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewgetcolumninfo.asp">MsiViewGetColumnInfo</a>
+        /// </p></remarks>
+        public ColumnCollection Columns
+        {
+            get
+            {
+                if (this.columns == null)
+                {
+                    this.columns = new ColumnCollection(this);
+                }
+                return this.columns;
+            }
+        }
+
+        /// <summary>
+        /// Executes a SQL View query and supplies any required parameters. The query uses the
+        /// question mark token to represent parameters as described in SQL Syntax. The values of
+        /// these parameters are passed in as the corresponding fields of a parameter record.
+        /// </summary>
+        /// <param name="executeParams">Optional Record that supplies the parameters. This
+        /// Record contains values to replace the parameter tokens in the SQL query.</param>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Params"), SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public void Execute(Record executeParams)
+        {
+            uint ret = RemotableNativeMethods.MsiViewExecute(
+                (int) this.Handle,
+                (executeParams != null ? (int) executeParams.Handle : 0));
+            if (ret == (uint) NativeMethods.Error.BAD_QUERY_SYNTAX)
+            {
+                throw new BadQuerySyntaxException(this.sql);
+            }
+            else if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Executes a SQL View query.
+        /// </summary>
+        /// <exception cref="InstallerException">the View could not be executed</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewexecute.asp">MsiViewExecute</a>
+        /// </p></remarks>
+        public void Execute() { this.Execute(null); }
+
+        /// <summary>
+        /// Fetches the next sequential record from the view, or null if there are no more records.
+        /// </summary>
+        /// <exception cref="InstallerException">the View is not in an active state</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// The Record object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// It is best that the handle be closed manually as soon as it is no longer
+        /// needed, as leaving lots of unused handles open can degrade performance.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewfetch.asp">MsiViewFetch</a>
+        /// </p></remarks>
+        public Record Fetch()
+        {
+            int recordHandle;
+            uint ret = RemotableNativeMethods.MsiViewFetch((int) this.Handle, out recordHandle);
+            if (ret == (uint) NativeMethods.Error.NO_MORE_ITEMS)
+            {
+                return null;
+            }
+            else if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+
+            Record r = new Record((IntPtr) recordHandle, true, this);
+            r.IsFormatStringInvalid = true;
+            return r;
+        }
+
+        /// <summary>
+        /// Updates a fetched Record.
+        /// </summary>
+        /// <param name="mode">specifies the modify mode</param>
+        /// <param name="record">the Record to modify</param>
+        /// <exception cref="InstallerException">the modification failed,
+        /// or a validation was requested and the data did not pass</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// You can update or delete a record immediately after inserting, or seeking provided you
+        /// have NOT modified the 0th field of the inserted or sought record.
+        /// </p><p>
+        /// To execute any SQL statement, a View must be created. However, a View that does not
+        /// create a result set, such as CREATE TABLE, or INSERT INTO, cannot be used with any of
+        /// the Modify methods to update tables though the view.
+        /// </p><p>
+        /// You cannot fetch a record containing binary data from one database and then use
+        /// that record to insert the data into another database. To move binary data from one database
+        /// to another, you should export the data to a file and then import it into the new database
+        /// using a query and the <see cref="Record.SetStream(int,string)"/>. This ensures that each database has
+        /// its own copy of the binary data.
+        /// </p><p>
+        /// Note that custom actions can only add, modify, or remove temporary rows, columns,
+        /// or tables from a database. Custom actions cannot modify persistent data in a database,
+        /// such as data that is a part of the database stored on disk.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>
+        /// </p></remarks>
+        /// <seealso cref="Refresh"/>
+        /// <seealso cref="Insert"/>
+        /// <seealso cref="Update"/>
+        /// <seealso cref="Assign"/>
+        /// <seealso cref="Replace"/>
+        /// <seealso cref="Delete"/>
+        /// <seealso cref="InsertTemporary"/>
+        /// <seealso cref="Seek"/>
+        /// <seealso cref="Merge"/>
+        /// <seealso cref="Validate"/>
+        /// <seealso cref="ValidateNew"/>
+        /// <seealso cref="ValidateFields"/>
+        /// <seealso cref="ValidateDelete"/>
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public void Modify(ViewModifyMode mode, Record record)
+        {
+            if (record == null)
+            {
+                throw new ArgumentNullException("record");
+            }
+
+            uint ret = RemotableNativeMethods.MsiViewModify((int) this.Handle, (int) mode, (int) record.Handle);
+            if (mode == ViewModifyMode.Insert || mode == ViewModifyMode.InsertTemporary)
+            {
+                record.IsFormatStringInvalid = true;
+            }
+            if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+        }
+
+        /// <summary>
+        /// Refreshes the data in a Record.
+        /// </summary>
+        /// <param name="record">the Record to be refreshed</param>
+        /// <exception cref="InstallerException">the refresh failed</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// The Record must have been obtained by calling <see cref="Fetch"/>. Fails with
+        /// a deleted Record. Works only with read-write Records.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>
+        /// </p></remarks>
+        public void Refresh(Record record) { this.Modify(ViewModifyMode.Refresh, record); }
+
+        /// <summary>
+        /// Inserts a Record into the view.
+        /// </summary>
+        /// <param name="record">the Record to be inserted</param>
+        /// <exception cref="InstallerException">the insertion failed</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// Fails if a row with the same primary keys exists. Fails with a read-only database.
+        /// This method cannot be used with a View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>
+        /// </p></remarks>
+        public void Insert(Record record) { this.Modify(ViewModifyMode.Insert, record); }
+
+        /// <summary>
+        /// Updates the View with new data from the Record.
+        /// </summary>
+        /// <param name="record">the new data</param>
+        /// <exception cref="InstallerException">the update failed</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// Only non-primary keys can be updated. The Record must have been obtained by calling
+        /// <see cref="Fetch"/>. Fails with a deleted Record. Works only with read-write Records.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>
+        /// </p></remarks>
+        public void Update(Record record) { this.Modify(ViewModifyMode.Update, record); }
+
+        /// <summary>
+        /// Updates or inserts a Record into the View.
+        /// </summary>
+        /// <param name="record">the Record to be assigned</param>
+        /// <exception cref="InstallerException">the assignment failed</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// Updates record if the primary keys match an existing row and inserts if they do not match.
+        /// Fails with a read-only database. This method cannot be used with a View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>
+        /// </p></remarks>
+        public void Assign(Record record) { this.Modify(ViewModifyMode.Assign, record); }
+
+        /// <summary>
+        /// Updates or deletes and inserts a Record into the View.
+        /// </summary>
+        /// <param name="record">the Record to be replaced</param>
+        /// <exception cref="InstallerException">the replacement failed</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// The Record must have been obtained by calling <see cref="Fetch"/>. 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 method cannot be used with a View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>
+        /// </p></remarks>
+        public void Replace(Record record) { this.Modify(ViewModifyMode.Replace, record); }
+
+        /// <summary>
+        /// Deletes a Record from the View.
+        /// </summary>
+        /// <param name="record">the Record to be deleted</param>
+        /// <exception cref="InstallerException">the deletion failed</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// The Record must have been obtained by calling <see cref="Fetch"/>. Fails if the row has been
+        /// deleted. Works only with read-write records. This method cannot be used with a View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>
+        /// </p></remarks>
+        public void Delete(Record record) { this.Modify(ViewModifyMode.Delete, record); }
+
+        /// <summary>
+        /// Inserts a Record into the View.  The inserted data is not persistent.
+        /// </summary>
+        /// <param name="record">the Record to be inserted</param>
+        /// <exception cref="InstallerException">the insertion failed</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// Fails if a row with the same primary key exists. Works only with read-write records.
+        /// This method cannot be used with a View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>
+        /// </p></remarks>
+        public void InsertTemporary(Record record) { this.Modify(ViewModifyMode.InsertTemporary, record); }
+
+        /// <summary>
+        /// Refreshes the information in the supplied record without changing the position
+        /// in the result set and without affecting subsequent fetch operations.
+        /// </summary>
+        /// <param name="record">the Record to be filled with the result of the seek</param>
+        /// <exception cref="InstallerException">the seek failed</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// After seeking, the Record may then be used for subsequent Update, Delete, and Refresh
+        /// operations.  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 method cannot be used with a View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public bool Seek(Record record)
+        {
+            if (record == null)
+            {
+                throw new ArgumentNullException("record");
+            }
+
+            uint ret = RemotableNativeMethods.MsiViewModify((int) this.Handle, (int) ViewModifyMode.Seek, (int) record.Handle);
+            record.IsFormatStringInvalid = true;
+            if (ret == (uint) NativeMethods.Error.FUNCTION_FAILED)
+            {
+                return false;
+            }
+            else if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Inserts or validates a record.
+        /// </summary>
+        /// <param name="record">the Record to be merged</param>
+        /// <returns>true if the record was inserted or validated, false if there is an existing
+        /// record with the same primary keys that is not identical</returns>
+        /// <exception cref="InstallerException">the merge failed (for a reason other than invalid data)</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// Works only with read-write records. This method cannot be used with a
+        /// View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public bool Merge(Record record)
+        {
+            if (record == null)
+            {
+                throw new ArgumentNullException("record");
+            }
+
+            uint ret = RemotableNativeMethods.MsiViewModify((int) this.Handle, (int) ViewModifyMode.Merge, (int) record.Handle);
+            if (ret == (uint) NativeMethods.Error.FUNCTION_FAILED)
+            {
+                return false;
+            }
+            else if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// Validates a record, returning information about any errors.
+        /// </summary>
+        /// <param name="record">the Record to be validated</param>
+        /// <returns>null if the record was validated; if there is an existing record with
+        /// the same primary keys that has conflicting data then error information is returned</returns>
+        /// <exception cref="InstallerException">the validation failed (for a reason other than invalid data)</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// The Record must have been obtained by calling <see cref="Fetch"/>.
+        /// Works with read-write and read-only records. This method cannot be used
+        /// with a View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewgeterror.asp">MsiViewGetError</a>
+        /// </p></remarks>
+        public ICollection<ValidationErrorInfo> Validate(Record record) { return this.InternalValidate(ViewModifyMode.Validate, record); }
+
+        /// <summary>
+        /// Validates a new record, returning information about any errors.
+        /// </summary>
+        /// <param name="record">the Record to be validated</param>
+        /// <returns>null if the record was validated; if there is an existing
+        /// record with the same primary keys then error information is returned</returns>
+        /// <exception cref="InstallerException">the validation failed (for a reason other than invalid data)</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// Checks for duplicate keys. The Record must have been obtained by
+        /// calling <see cref="Fetch"/>. Works with read-write and read-only records.
+        /// This method cannot be used with a View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewgeterror.asp">MsiViewGetError</a>
+        /// </p></remarks>
+        [SuppressMessage("Microsoft.Naming", "CA1711:IdentifiersShouldNotHaveIncorrectSuffix")]
+        public ICollection<ValidationErrorInfo> ValidateNew(Record record) { return this.InternalValidate(ViewModifyMode.ValidateNew, record); }
+
+        /// <summary>
+        /// Validates fields of a fetched or new record, returning information about any errors.
+        /// Can validate one or more fields of an incomplete record.
+        /// </summary>
+        /// <param name="record">the Record to be validated</param>
+        /// <returns>null if the record was validated; if there is an existing record with
+        /// the same primary keys that has conflicting data then error information is returned</returns>
+        /// <exception cref="InstallerException">the validation failed (for a reason other than invalid data)</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// Works with read-write and read-only records. This method cannot be used with
+        /// a View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewgeterror.asp">MsiViewGetError</a>
+        /// </p></remarks>
+        public ICollection<ValidationErrorInfo> ValidateFields(Record record) { return this.InternalValidate(ViewModifyMode.ValidateField, record); }
+
+        /// <summary>
+        /// Validates a record that will be deleted later, returning information about any errors.
+        /// </summary>
+        /// <param name="record">the Record to be validated</param>
+        /// <returns>null if the record is safe to delete; if another row refers to
+        /// the primary keys of this row then error information is returned</returns>
+        /// <exception cref="InstallerException">the validation failed (for a reason other than invalid data)</exception>
+        /// <exception cref="InvalidHandleException">the View handle is invalid</exception>
+        /// <remarks><p>
+        /// 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. Works with
+        /// read-write and read-only records. This method cannot be used with a View containing joins.
+        /// </p><p>
+        /// See <see cref="Modify"/> for more remarks.
+        /// </p><p>
+        /// Win32 MSI APIs:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewmodify.asp">MsiViewModify</a>,
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewgeterror.asp">MsiViewGetError</a>
+        /// </p></remarks>
+        public ICollection<ValidationErrorInfo> ValidateDelete(Record record) { return this.InternalValidate(ViewModifyMode.ValidateDelete, record); }
+
+        /// <summary>
+        /// Enumerates over the Records retrieved by the View.
+        /// </summary>
+        /// <returns>An enumerator of Record objects.</returns>
+        /// <exception cref="InstallerException">The View was not <see cref="Execute(Record)"/>d before attempting the enumeration.</exception>
+        /// <remarks><p>
+        /// Each Record object should be <see cref="InstallerHandle.Close"/>d after use.
+        /// It is best that the handle be closed manually as soon as it is no longer
+        /// needed, as leaving lots of unused handles open can degrade performance.
+        /// However, note that it is not necessary to complete the enumeration just
+        /// for the purpose of closing handles, because Records are fetched lazily
+        /// on each step of the enumeration.
+        /// </p><p>
+        /// Win32 MSI API:
+        /// <a href="http://msdn.microsoft.com/library/en-us/msi/setup/msiviewfetch.asp">MsiViewFetch</a>
+        /// </p></remarks>
+        public IEnumerator<Record> GetEnumerator()
+        {
+            Record rec;
+            while ((rec = this.Fetch()) != null)
+            {
+                yield return rec;
+            }
+        }
+
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return this.GetEnumerator();
+        }
+
+        private ICollection<ValidationErrorInfo> InternalValidate(ViewModifyMode mode, Record record)
+        {
+            uint ret = RemotableNativeMethods.MsiViewModify((int) this.Handle, (int) mode, (int) record.Handle);
+            if (ret == (uint) NativeMethods.Error.INVALID_DATA)
+            {
+                ICollection<ValidationErrorInfo> errorInfo = new List<ValidationErrorInfo>();
+                while (true)
+                {
+                    uint bufSize = 40;
+                    StringBuilder column = new StringBuilder("", (int) bufSize);
+                    int error = RemotableNativeMethods.MsiViewGetError((int) this.Handle, column, ref bufSize);
+                    if (error == -2 /*MSIDBERROR_MOREDATA*/)
+                    {
+                        column.Capacity = (int) ++bufSize;
+                        error = RemotableNativeMethods.MsiViewGetError((int) this.Handle, column, ref bufSize);
+                    }
+                    
+                    if (error == -3 /*MSIDBERROR_INVALIDARG*/)
+                    {
+                        throw InstallerException.ExceptionFromReturnCode((uint) NativeMethods.Error.INVALID_PARAMETER);
+                    }
+                    else if (error == 0 /*MSIDBERROR_NOERROR*/)
+                    {
+                        break;
+                    }
+
+                    errorInfo.Add(new ValidationErrorInfo((ValidationError) error, column.ToString()));
+                }
+
+                return errorInfo;
+            }
+            else if (ret != 0)
+            {
+                throw InstallerException.ExceptionFromReturnCode(ret);
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/WindowsInstaller.cd b/src/dtf/WixToolset.Dtf.WindowsInstaller/WindowsInstaller.cd
new file mode 100644
index 00000000..01b68153
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/WindowsInstaller.cd
@@ -0,0 +1,943 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+  <Comment CommentText="Database classes">
+    <Position X="3.433" Y="7.717" Height="0.26" Width="1.159" />
+  </Comment>
+  <Comment CommentText="Custom action classes">
+    <Position X="5.791" Y="1.774" Height="0.312" Width="1.465" />
+  </Comment>
+  <Comment CommentText="Inventory classes">
+    <Position X="12.323" Y="2.386" Height="0.292" Width="1.183" />
+  </Comment>
+  <Comment CommentText="Exceptions">
+    <Position X="11.75" Y="9.25" Height="0.285" Width="0.798" />
+  </Comment>
+  <Comment CommentText="Callback delegates">
+    <Position X="17.25" Y="8" Height="0.281" Width="1.25" />
+  </Comment>
+  <Comment CommentText="API enums">
+    <Position X="21.992" Y="0.5" Height="0.283" Width="2.008" />
+  </Comment>
+  <Comment CommentText="Database column enums">
+    <Position X="24.25" Y="0.5" Height="0.26" Width="1.983" />
+  </Comment>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.Database">
+    <Position X="0.5" Y="5" Width="2.25" />
+    <Members>
+      <Method Name="Database" Hidden="true" />
+      <Field Name="deleteOnClose" Hidden="true" />
+      <Method Name="Dispose" Hidden="true" />
+      <Method Name="ExecutePropertyQuery" Hidden="true" />
+      <Field Name="filePath" Hidden="true" />
+      <Method Name="Open" Hidden="true" />
+      <Field Name="openMode" Hidden="true" />
+      <Field Name="summaryInfo" Hidden="true" />
+      <Field Name="tables" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallerHandle" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="3.312" Y="2.119" />
+        <Point X="3.312" Y="2.689" />
+        <Point X="2.699" Y="2.689" />
+        <Point X="2.699" Y="5" />
+      </Path>
+    </InheritanceLine>
+    <AssociationLine Name="Tables" Type="WixToolset.Dtf.WindowsInstaller.TableInfo" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="2.75" Y="8.125" />
+        <Point X="3.75" Y="8.125" />
+        <Point X="3.75" Y="8.5" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true">
+        <Position X="0.293" Y="0.152" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <AssociationLine Name="SummaryInfo" Type="WixToolset.Dtf.WindowsInstaller.SummaryInfo" FixedFromPoint="true">
+      <Path>
+        <Point X="1.318" Y="5" />
+        <Point X="1.318" Y="4.535" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+        <Position X="-1.155" Y="0.279" Height="0.16" Width="1.095" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <TypeIdentifier>
+      <HashCode>QABACUgAACAAIAVUIAgQREACAAIAk0ABAIhmoEAAAAA=</HashCode>
+      <FileName>Database.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Property Name="SummaryInfo" />
+    </ShowAsAssociation>
+    <ShowAsCollectionAssociation>
+      <Property Name="Tables" />
+    </ShowAsCollectionAssociation>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.InstallerHandle">
+    <Position X="3" Y="0.5" Width="2" />
+    <Members>
+      <Method Name="Dispose" Hidden="true" />
+      <Method Name="Equals" Hidden="true" />
+      <Method Name="GetHashCode" Hidden="true" />
+      <Field Name="handle" Hidden="true" />
+      <Method Name="InstallerHandle" Hidden="true" />
+      <Property Name="Sync" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAACAAAACAgAAAAAAAAAAAAMIAAAACAACAAAA=</HashCode>
+      <FileName>Handle.cs</FileName>
+    </TypeIdentifier>
+    <Lollipop Position="0.2" />
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.Installer">
+    <Position X="19.25" Y="0.5" Width="2.5" />
+    <Members>
+      <Method Name="CheckInstallResult" Hidden="true" />
+      <Field Name="errorResources" Hidden="true" />
+      <Property Name="ErrorResources" Hidden="true" />
+      <Field Name="externalUIHandlers" Hidden="true" />
+      <Method Name="GetMessageFromModule" Hidden="true" />
+      <Method Name="GetPatchStringDataType" Hidden="true" />
+      <Field Name="rebootInitiated" Hidden="true" />
+      <Field Name="rebootRequired" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>IAQBiIgAgAKAAAAELEAAPBgJAUAAYAAAAOQDagAgAQE=</HashCode>
+      <FileName>ExternalUIHandler.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.Record">
+    <Position X="5.25" Y="3" Width="2" />
+    <Members>
+      <Method Name="CheckRange" Hidden="true" />
+      <Method Name="ExtractSubStorage" Hidden="true" />
+      <Method Name="FindColumn" Hidden="true" />
+      <Method Name="Record" Hidden="true" />
+      <Field Name="view" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallerHandle" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="3.688" Y="2.119" />
+        <Point X="3.688" Y="2.672" />
+        <Point X="5.4" Y="2.672" />
+        <Point X="5.4" Y="3" />
+      </Path>
+    </InheritanceLine>
+    <TypeIdentifier>
+      <HashCode>AIAAAAAAAAAAAIAEiEIAJAAAAQgIEIAIIQCAAABIAAA=</HashCode>
+      <FileName>Record.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.Session">
+    <Position X="7.5" Y="0.5" Width="2.25" />
+    <Members>
+      <Field Name="database" Hidden="true" />
+      <Method Name="Dispose" Hidden="true" />
+      <Method Name="IFormatProvider.GetFormat" Hidden="true" />
+      <Method Name="Session" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallerHandle" FixedFromPoint="true">
+      <Path>
+        <Point X="3.875" Y="2.119" />
+        <Point X="3.875" Y="2.395" />
+        <Point X="7.5" Y="2.395" />
+      </Path>
+    </InheritanceLine>
+    <AssociationLine Name="Database" Type="WixToolset.Dtf.WindowsInstaller.Database" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="7.562" Y="4.696" />
+        <Point X="7.562" Y="10.375" />
+        <Point X="2.75" Y="10.375" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+        <Position X="4.869" Y="5.46" Height="0.16" Width="0.806" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <AssociationLine Name="Components" Type="WixToolset.Dtf.WindowsInstaller.ComponentInfo" FixedFromPoint="true">
+      <Path>
+        <Point X="8.562" Y="4.696" />
+        <Point X="8.562" Y="5.5" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+        <Position X="-1.021" Y="0.317" Height="0.16" Width="0.986" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <AssociationLine Name="Features" Type="WixToolset.Dtf.WindowsInstaller.FeatureInfo">
+      <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+        <Position X="0.016" Y="2.568" Height="0.16" Width="0.785" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <TypeIdentifier>
+      <HashCode>AAAAEAAAKGAAAoDADIBBAAAAAAgIEABBEIAAIAAACAA=</HashCode>
+      <FileName>Session.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Property Name="Database" />
+    </ShowAsAssociation>
+    <ShowAsCollectionAssociation>
+      <Property Name="Components" />
+      <Property Name="Features" />
+    </ShowAsCollectionAssociation>
+    <Lollipop Position="0.2" />
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.SummaryInfo">
+    <Position X="0.5" Y="0.5" Width="2" />
+    <Members>
+      <Field Name="MAX_PROPERTIES" Hidden="true" />
+      <Method Name="OpenSummaryInfo" Hidden="true" />
+      <Method Name="SummaryInfo" Hidden="true" />
+      <Property Name="this" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallerHandle" FixedFromPoint="true">
+      <Path>
+        <Point X="3.125" Y="2.119" />
+        <Point X="3.125" Y="2.404" />
+        <Point X="2.5" Y="2.404" />
+      </Path>
+    </InheritanceLine>
+    <TypeIdentifier>
+      <HashCode>AQAAAAAAAEAAAEAAjMgAAJIAAAEAAAAAAAAEhAAAoCI=</HashCode>
+      <FileName>SummaryInfo.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.View">
+    <Position X="3" Y="3" Width="2" />
+    <Members>
+      <Field Name="columns" Hidden="true" />
+      <Field Name="database" Hidden="true" />
+      <Method Name="InternalValidate" Hidden="true" />
+      <Field Name="sql" Hidden="true" />
+      <Method Name="System.Collections.IEnumerable.GetEnumerator" Hidden="true" />
+      <Field Name="tables" Hidden="true" />
+      <Method Name="View" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallerHandle" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="3.5" Y="2.119" />
+        <Point X="3.5" Y="3" />
+      </Path>
+    </InheritanceLine>
+    <AssociationLine Name="Database" Type="WixToolset.Dtf.WindowsInstaller.Database" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="3.75" Y="7.196" />
+        <Point X="3.75" Y="7.562" />
+        <Point X="2.75" Y="7.562" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+        <Position X="0.168" Y="0.16" Height="0.16" Width="0.831" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <AssociationLine Name="Columns" Type="WixToolset.Dtf.WindowsInstaller.ColumnInfo" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="4.25" Y="7.196" />
+        <Point X="4.25" Y="7.562" />
+        <Point X="5.25" Y="7.562" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+        <Position X="0.168" Y="0.152" Height="0.16" Width="0.787" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <TypeIdentifier>
+      <HashCode>ICQAIEQAAEDgABRACQEAQECBAAEAAQAACAAAAAgAACA=</HashCode>
+      <FileName>View.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Property Name="Database" />
+    </ShowAsAssociation>
+    <ShowAsCollectionAssociation>
+      <Property Name="Columns" />
+    </ShowAsCollectionAssociation>
+    <Lollipop Position="0.638" />
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.TableInfo">
+    <Position X="3" Y="8.5" Width="2" />
+    <Members>
+      <Field Name="columns" Hidden="true" />
+      <Method Name="GetTablePrimaryKeys" Hidden="true" />
+      <Field Name="name" Hidden="true" />
+      <Field Name="primaryKeys" Hidden="true" />
+      <Method Name="TableInfo" Hidden="true" />
+      <Method Name="ToString" Hidden="true" />
+    </Members>
+    <AssociationLine Name="Columns" Type="WixToolset.Dtf.WindowsInstaller.ColumnInfo" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="4.25" Y="8.5" />
+        <Point X="4.25" Y="8.125" />
+        <Point X="5.25" Y="8.125" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+        <Position X="0.143" Y="-0.338" Height="0.16" Width="0.787" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAEAAAAAEACAAAAQAQAAEAAAASAAAAAgAAAA=</HashCode>
+      <FileName>TableInfo.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsCollectionAssociation>
+      <Property Name="Columns" />
+    </ShowAsCollectionAssociation>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.ColumnInfo">
+    <Position X="5.25" Y="7.25" Width="2" />
+    <Members>
+      <Method Name="ColumnInfo" Hidden="true" />
+      <Field Name="isLocalizable" Hidden="true" />
+      <Field Name="isRequired" Hidden="true" />
+      <Field Name="isTemporary" Hidden="true" />
+      <Field Name="name" Hidden="true" />
+      <Field Name="size" Hidden="true" />
+      <Method Name="ToString" Hidden="true" />
+      <Field Name="type" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AgAAAAAAAAAAgCAEEIAAABQgQAAFIAAAAQAAAAIAEAA=</HashCode>
+      <FileName>ColumnInfo.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.CustomActionAttribute">
+    <Position X="5.25" Y="0.5" Width="2" />
+    <Members>
+      <Method Name="CustomActionAttribute" Hidden="true" />
+      <Field Name="name" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAQAAAAEAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>CustomActionAttribute.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.Installation">
+    <Position X="12.5" Y="0.5" Width="2" />
+    <Members>
+      <Field Name="context" Hidden="true" />
+      <Method Name="Installation" Hidden="true" />
+      <Field Name="installationCode" Hidden="true" />
+      <Property Name="InstallationCode" Hidden="true" />
+      <Property Name="InstallationType" Hidden="true" />
+      <Field Name="sourceList" Hidden="true" />
+      <Field Name="userSid" Hidden="true" />
+    </Members>
+    <AssociationLine Name="SourceList" Type="WixToolset.Dtf.WindowsInstaller.SourceList" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="13.75" Y="1.95" />
+        <Point X="13.75" Y="2.298" />
+        <Point X="14.75" Y="2.298" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+        <Position X="0.076" Y="0.114" Height="0.16" Width="0.868" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <TypeIdentifier>
+      <HashCode>AAACIhAAAoAQAACACAAAAABAAAAAAAAAAAAEAAAAAAA=</HashCode>
+      <FileName>Installation.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Property Name="SourceList" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.InstallationPart">
+    <Position X="17" Y="3" Width="2" />
+    <Members>
+      <Field Name="id" Hidden="true" />
+      <Property Name="Id" Hidden="true" />
+      <Method Name="InstallationPart" Hidden="true" />
+      <Field Name="productCode" Hidden="true" />
+      <Property Name="ProductCode" Hidden="true" />
+    </Members>
+    <AssociationLine Name="Product" Type="WixToolset.Dtf.WindowsInstaller.ProductInstallation" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="17.611" Y="3.967" />
+        <Point X="17.611" Y="4.519" />
+        <Point X="14.76" Y="4.519" />
+        <Point X="14.76" Y="6.438" />
+        <Point X="12.25" Y="6.438" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+        <Position X="4.65" Y="2.262" Height="0.16" Width="0.703" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <TypeIdentifier>
+      <HashCode>AAAiAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAIgA=</HashCode>
+      <FileName>InstallationPart.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Property Name="Product" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.ProductInstallation">
+    <Position X="10" Y="0.5" Width="2.25" />
+    <Members>
+      <Method Name="EnumFeatures" Hidden="true" />
+      <Method Name="EnumProducts" Hidden="true" />
+      <Method Name="EnumRelatedProducts" Hidden="true" />
+      <Property Name="InstallationType" Hidden="true" />
+      <Field Name="properties" Hidden="true" />
+      <Property Name="State" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.Installation" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="13.312" Y="1.95" />
+        <Point X="13.312" Y="2.312" />
+        <Point X="12.25" Y="2.312" />
+      </Path>
+    </InheritanceLine>
+    <AssociationLine Name="AllProducts" Type="WixToolset.Dtf.WindowsInstaller.ProductInstallation" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="10.5" Y="7.273" />
+        <Point X="10.5" Y="7.523" />
+        <Point X="11.562" Y="7.523" />
+        <Point X="11.562" Y="7.273" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true">
+        <Position X="0.068" Y="0.052" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <AssociationLine Name="Features" Type="WixToolset.Dtf.WindowsInstaller.FeatureInstallation" FixedToPoint="true">
+      <Path>
+        <Point X="12.25" Y="6.813" />
+        <Point X="15" Y="6.813" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true">
+        <Position X="1.922" Y="0.05" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <TypeIdentifier>
+      <HashCode>UAIEYrAGAAAACQBAKEABAAoASA0ARQAASUIGBAAIIAA=</HashCode>
+      <FileName>ProductInstallation.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsCollectionAssociation>
+      <Property Name="AllProducts" />
+      <Property Name="Features" />
+    </ShowAsCollectionAssociation>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.PatchInstallation">
+    <Position X="12.5" Y="2.75" Width="2" />
+    <Members>
+      <Method Name="EnumPatches" Hidden="true" />
+      <Property Name="InstallationType" Hidden="true" />
+      <Method Name="PatchInstallation" Hidden="true" />
+      <Field Name="productCode" Hidden="true" />
+      <Property Name="State" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.Installation" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="13.562" Y="1.95" />
+        <Point X="13.562" Y="2.75" />
+      </Path>
+    </InheritanceLine>
+    <AssociationLine Name="AllPatches" Type="WixToolset.Dtf.WindowsInstaller.PatchInstallation" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="12.938" Y="5.98" />
+        <Point X="12.938" Y="6.23" />
+        <Point X="14" Y="6.23" />
+        <Point X="14" Y="5.98" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true">
+        <Position X="0.093" Y="0.06" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <TypeIdentifier>
+      <HashCode>AAAgsgCACAAAAAAAKEAAAgAAAgAAAAAAAgIAFAAAIAA=</HashCode>
+      <FileName>PatchInstallation.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsCollectionAssociation>
+      <Property Name="AllPatches" />
+    </ShowAsCollectionAssociation>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.ComponentInstallation">
+    <Position X="17" Y="5" Width="2" />
+    <Members>
+      <Method Name="ComponentInstallation" Hidden="true" />
+      <Method Name="EnumClients" Hidden="true" />
+      <Method Name="EnumComponents" Hidden="true" />
+      <Method Name="EnumQualifiers" Hidden="true" />
+      <Method Name="GetProductCode" Hidden="true" />
+    </Members>
+    <Compartments>
+      <Compartment Name="Nested Types" Collapsed="false" />
+    </Compartments>
+    <NestedTypes>
+      <Struct Name="WixToolset.Dtf.WindowsInstaller.ComponentInstallation.Qualifier" Collapsed="true">
+        <TypeIdentifier>
+          <NewMemberFileName>ComponentInstallation.cs</NewMemberFileName>
+        </TypeIdentifier>
+      </Struct>
+    </NestedTypes>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallationPart" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="18.111" Y="3.967" />
+        <Point X="18.111" Y="5" />
+      </Path>
+    </InheritanceLine>
+    <AssociationLine Name="AllComponents" Type="WixToolset.Dtf.WindowsInstaller.ComponentInstallation" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="17.375" Y="7.443" />
+        <Point X="17.375" Y="7.693" />
+        <Point X="18.625" Y="7.693" />
+        <Point X="18.625" Y="7.443" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true">
+        <Position X="0.068" Y="0.052" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <AssociationLine Name="ClientProducts" Type="WixToolset.Dtf.WindowsInstaller.ProductInstallation" FixedFromPoint="true">
+      <Path>
+        <Point X="17" Y="7.188" />
+        <Point X="12.25" Y="7.188" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true" ManuallySized="true">
+        <Position X="3.658" Y="-0.195" Height="0.16" Width="1.087" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <TypeIdentifier>
+      <HashCode>AUAAAAACAAAAAAIAEAgQAAQAAAAAAAAEAAAABAAAAAA=</HashCode>
+      <FileName>ComponentInstallation.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsCollectionAssociation>
+      <Property Name="AllComponents" />
+      <Property Name="ClientProducts" />
+    </ShowAsCollectionAssociation>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.FeatureInstallation">
+    <Position X="15" Y="4.75" Width="1.75" />
+    <Members>
+      <Method Name="FeatureInstallation" Hidden="true" />
+    </Members>
+    <Compartments>
+      <Compartment Name="Nested Types" Collapsed="false" />
+    </Compartments>
+    <NestedTypes>
+      <Struct Name="WixToolset.Dtf.WindowsInstaller.FeatureInstallation.UsageData" Collapsed="true">
+        <TypeIdentifier>
+          <NewMemberFileName>FeatureInstallation.cs</NewMemberFileName>
+        </TypeIdentifier>
+      </Struct>
+    </NestedTypes>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallationPart" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="17.889" Y="3.967" />
+        <Point X="17.889" Y="4.804" />
+        <Point X="16.75" Y="4.804" />
+      </Path>
+    </InheritanceLine>
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAEAAAAACAAAAAABAAAAAA=</HashCode>
+      <FileName>FeatureInstallation.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.SourceList">
+    <Position X="14.75" Y="0.5" Width="2" />
+    <Members>
+      <Method Name="ClearSourceType" Hidden="true" />
+      <Method Name="Contains" Hidden="true" />
+      <Method Name="CopyTo" Hidden="true" />
+      <Method Name="EnumSources" Hidden="true" />
+      <Field Name="installation" Hidden="true" />
+      <Field Name="mediaList" Hidden="true" />
+      <Method Name="SourceList" Hidden="true" />
+      <Method Name="System.Collections.IEnumerable.GetEnumerator" Hidden="true" />
+    </Members>
+    <AssociationLine Name="MediaList" Type="WixToolset.Dtf.WindowsInstaller.MediaDisk" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="16.75" Y="2.375" />
+        <Point X="17.667" Y="2.375" />
+        <Point X="17.667" Y="1.789" />
+      </Path>
+      <MemberNameLabel ManuallyPlaced="true">
+        <Position X="0.029" Y="0.377" />
+      </MemberNameLabel>
+    </AssociationLine>
+    <TypeIdentifier>
+      <HashCode>BCIAAEAAEABAABgQCAAABIQAAFAQAAAAAAAABARwIgA=</HashCode>
+      <FileName>SourceList.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsCollectionAssociation>
+      <Property Name="MediaList" />
+    </ShowAsCollectionAssociation>
+    <Lollipop Position="0.2" />
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.ComponentInfo">
+    <Position X="8" Y="5.5" Width="1.5" />
+    <Members>
+      <Method Name="ComponentInfo" Hidden="true" />
+      <Field Name="name" Hidden="true" />
+      <Field Name="session" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AQAAAAIAAAAAAAAAAAEAACQAAAAEAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>ComponentInfo.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.FeatureInfo">
+    <Position X="8" Y="7.5" Width="1.75" />
+    <Members>
+      <Method Name="FeatureInfo" Hidden="true" />
+      <Field Name="name" Hidden="true" />
+      <Field Name="session" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AQAAAAIAAAggAEAAAAEAACQQAAAEAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>FeatureInfo.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.InstallerException">
+    <Position X="11.75" Y="7.5" Width="2.25" />
+    <Members>
+      <Method Name="Combine" Hidden="true" />
+      <Field Name="errorCode" Hidden="true" />
+      <Field Name="errorData" Hidden="true" />
+      <Method Name="ExceptionFromReturnCode" Hidden="true" />
+      <Method Name="GetObjectData" Hidden="true" />
+      <Method Name="GetSystemMessage" Hidden="true" />
+      <Method Name="InstallerException" Hidden="true" />
+      <Method Name="SaveErrorRecord" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>hAAAAAAAAAAAAAQAAAAAAAAgAAgIAAAIAAABIAAAQAA=</HashCode>
+      <FileName>Exceptions.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.BadQuerySyntaxException" Collapsed="true">
+    <Position X="11.75" Y="9.75" Width="2.25" />
+    <Members>
+      <Method Name="BadQuerySyntaxException" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallerException" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="12.938" Y="9.119" />
+        <Point X="12.938" Y="9.75" />
+      </Path>
+    </InheritanceLine>
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Exceptions.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.InstallCanceledException" Collapsed="true">
+    <Position X="14.25" Y="9.75" Width="2.25" />
+    <Members>
+      <Method Name="InstallCanceledException" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallerException" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="13.375" Y="9.119" />
+        <Point X="13.375" Y="9.631" />
+        <Point X="14.25" Y="9.631" />
+        <Point X="14.25" Y="9.813" />
+      </Path>
+    </InheritanceLine>
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Exceptions.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.InvalidHandleException" Collapsed="true">
+    <Position X="14.25" Y="9" Width="2.25" />
+    <Members>
+      <Method Name="InvalidHandleException" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallerException" FixedFromPoint="true" FixedToPoint="true">
+      <Path>
+        <Point X="13.812" Y="9.119" />
+        <Point X="13.812" Y="9.375" />
+        <Point X="14.25" Y="9.375" />
+      </Path>
+    </InheritanceLine>
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Exceptions.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="WixToolset.Dtf.WindowsInstaller.MergeException">
+    <Position X="14.25" Y="7.5" Width="2.25" />
+    <Members>
+      <Field Name="conflictCounts" Hidden="true" />
+      <Field Name="conflictTables" Hidden="true" />
+      <Method Name="GetObjectData" Hidden="true" />
+      <Method Name="MergeException" Hidden="true" />
+    </Members>
+    <InheritanceLine Type="WixToolset.Dtf.WindowsInstaller.InstallerException" FixedFromPoint="true">
+      <Path>
+        <Point X="14" Y="8.813" />
+        <Point X="14.25" Y="8.813" />
+      </Path>
+    </InheritanceLine>
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAEAAEABAABAgAAAAAAAAAAAAIAAAAAA=</HashCode>
+      <FileName>Exceptions.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Struct Name="WixToolset.Dtf.WindowsInstaller.MediaDisk">
+    <Position X="17" Y="0.5" Width="2" />
+    <Members>
+      <Field Name="diskId" Hidden="true" />
+      <Field Name="diskPrompt" Hidden="true" />
+      <Method Name="MediaDisk" Hidden="true" />
+      <Field Name="volumeLabel" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AgAAAAAAAAAAAAAAAgAAIAAAACAAAAAEAAAABAAAAAA=</HashCode>
+      <FileName>MediaDisk.cs</FileName>
+    </TypeIdentifier>
+  </Struct>
+  <Struct Name="WixToolset.Dtf.WindowsInstaller.InstallCost">
+    <Position X="10" Y="8" Width="1.25" />
+    <Members>
+      <Field Name="cost" Hidden="true" />
+      <Field Name="driveName" Hidden="true" />
+      <Method Name="InstallCost" Hidden="true" />
+      <Field Name="tempCost" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAgAAAAIAAAAACBAAAAgQAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>InstallCost.cs</FileName>
+    </TypeIdentifier>
+  </Struct>
+  <Struct Name="WixToolset.Dtf.WindowsInstaller.ShortcutTarget">
+    <Position X="19.5" Y="7.75" Width="1.5" />
+    <Members>
+      <Field Name="componentCode" Hidden="true" />
+      <Method Name="Equals" Hidden="true" />
+      <Field Name="feature" Hidden="true" />
+      <Method Name="GetHashCode" Hidden="true" />
+      <Method Name="operator !=" Hidden="true" />
+      <Method Name="operator ==" Hidden="true" />
+      <Field Name="productCode" Hidden="true" />
+      <Method Name="ShortcutTarget" Hidden="true" />
+    </Members>
+    <TypeIdentifier>
+      <HashCode>AAAgAAACAAAAAAAAgAAAAAAAAAAAAIAIAAIACAAAIiA=</HashCode>
+      <FileName>ShortcutTarget.cs</FileName>
+    </TypeIdentifier>
+  </Struct>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.ActionResult" Collapsed="true">
+    <Position X="22" Y="1" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAQgAAAAAAAAAgAAAACAAAAAAAACAAA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.ControlAttributes" Collapsed="true">
+    <Position X="24.25" Y="1" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AADAAlQAAAEgAoNFAAgAACAgAQAAAooMAAAAgCkCAkA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.CustomActionTypes" Collapsed="true">
+    <Position X="24.25" Y="1.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AABCCFAAAAAhJAAHAAAAAoAAAAAAAAABCAIEEQEAgAA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.DatabaseOpenMode" Collapsed="true">
+    <Position X="22" Y="1.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAKAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAYAAAAAAA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.InstallLogModes" Collapsed="true">
+    <Position X="22" Y="2" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAABgEBAAIAAAQBAAAAAABEAAQAAABSAgAAEAEWQAAA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.InstallMessage" Collapsed="true">
+    <Position X="22" Y="2.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAABgABAAAAAAQBAAAAAABEAAQAAABSAgAAEAECAAAA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.InstallMode" Collapsed="true">
+    <Position X="22" Y="3" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAABAAAQAAAAAAAAAAAIAAAACAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.InstallRunMode" Collapsed="true">
+    <Position X="22" Y="3.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAgAIEACAAQAAAQCAAAAAQAACEAABAQAgAECAAAAAgA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.InstallState" Collapsed="true">
+    <Position X="22" Y="4" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAABAAAgAAAFACgACQJAAAAABQAAQAAAAAAAAAABA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.InstallType" Collapsed="true">
+    <Position X="22" Y="4.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAIAAAIAAAAAAAAAAAAgAAAAAAAAA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.InstallUIOptions" Collapsed="true">
+    <Position X="22" Y="5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAIACAAAAAAQAAAIACEAAAAAAAAAgIAAAGAAAA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.MessageResult" Collapsed="true">
+    <Position X="22" Y="5.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAASAAQASBAAAAAAAAAACAAAAAAAAABAAEAAAA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.ReinstallModes" Collapsed="true">
+    <Position X="22" Y="6" Width="2" />
+    <TypeIdentifier>
+      <HashCode>IAAAAAAAAACAAAAAAAAQAAAQBAAAABAAAAEAAgAIABA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.TransformErrors" Collapsed="true">
+    <Position X="22" Y="6.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAIEAAAAAAABAAAAAAAAAAQAAAAAAAACAAAgAAEAABA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.TransformValidations" Collapsed="true">
+    <Position X="22" Y="7" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAACAAAACAQIAAAAAAAAAAAAAEgAAAQAAIAQAQEAAAQ=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.UserContexts" Collapsed="true">
+    <Position X="22" Y="7.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAgAAAAAAAAEAAAAAAIAAAAAAAAAAIAAQAEAAAA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.ValidationError" Collapsed="true">
+    <Position X="22" Y="8" Width="2" />
+    <TypeIdentifier>
+      <HashCode>oCMBAAABEAMAAAAAAAAQAAIASigAABKBABgCgEEAAA4=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.ViewModifyMode" Collapsed="true">
+    <Position X="22" Y="8.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>IAQAAEQAAADgAAAACAAAAACAAAEAAQAAAAAAAAAAACA=</HashCode>
+      <FileName>Enums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.ComponentAttributes" Collapsed="true">
+    <Position X="24.25" Y="2" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAABAAAAIAAAAAAAEAAACAAAIAAAgQCAAAAgAAEAAAA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.DialogAttributes" Collapsed="true">
+    <Position X="24.25" Y="2.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAIAAQAAAAAAQIEAAAAACAAEAAAAAAIgAAggAAAAgA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.FeatureAttributes" Collapsed="true">
+    <Position X="24.25" Y="3" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAQEAAAEAAAAAAAAAAAAAAEAAAAAABABAAAAEAAAA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.FileAttributes" Collapsed="true">
+    <Position X="24.25" Y="3.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAABAAIAIAAAAAAAAAgAAAAAEAAAAAAEIAAEEAAA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.IniFileAction" Collapsed="true">
+    <Position X="24.25" Y="4" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AggAAAAAAAAAEAEAAAAAAAAAAAABAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.LocatorTypes" Collapsed="true">
+    <Position X="24.25" Y="4.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>ABAAABAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAABAAAA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.RegistryRoot" Collapsed="true">
+    <Position X="24.25" Y="5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AACgACAAAIAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.RemoveFileModes" Collapsed="true">
+    <Position X="24.25" Y="5.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAACAAAEAAAA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.ServiceAttributes" Collapsed="true">
+    <Position X="24.25" Y="6" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AQCAAAAAQAAAAAAAAACAAAgAAAAAAAAAAgAAABEAAAI=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.ServiceControlEvents" Collapsed="true">
+    <Position X="24.25" Y="6.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAACAAAAAAAAAAEAAAAAEAAgAAJAAAAAEAAAA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.TextStyles" Collapsed="true">
+    <Position X="24.25" Y="7" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAACAAAIAAAAAAAAACAAAAAAAAAAAAAAE=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Enum Name="WixToolset.Dtf.WindowsInstaller.UpgradeAttributes" Collapsed="true">
+    <Position X="24.25" Y="7.5" Width="2" />
+    <TypeIdentifier>
+      <HashCode>AEAAAAAAAAAAAAAQAAAAAAAAAAgIAAAAABAAAAAAIAA=</HashCode>
+      <FileName>ColumnEnums.cs</FileName>
+    </TypeIdentifier>
+  </Enum>
+  <Delegate Name="WixToolset.Dtf.WindowsInstaller.InapplicablePatchHandler" Collapsed="true">
+    <Position X="16.75" Y="9.75" Width="2.25" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAACAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Installer.cs</FileName>
+    </TypeIdentifier>
+  </Delegate>
+  <Delegate Name="WixToolset.Dtf.WindowsInstaller.ExternalUIHandler" Collapsed="true">
+    <Position X="16.75" Y="8.5" Width="2.25" />
+    <TypeIdentifier>
+      <HashCode>AAAEAAAAAAAAABAAAAAABAAAAACBAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>ExternalUIHandler.cs</FileName>
+    </TypeIdentifier>
+  </Delegate>
+  <Delegate Name="WixToolset.Dtf.WindowsInstaller.ExternalUIRecordHandler" Collapsed="true">
+    <Position X="16.75" Y="9" Width="2.25" />
+    <TypeIdentifier>
+      <HashCode>AAAEAAAAAAAAAAAAAAAABAAAAACBAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>ExternalUIHandler.cs</FileName>
+    </TypeIdentifier>
+  </Delegate>
+  <Font Name="Verdana" Size="8" />
+</ClassDiagram>
\ No newline at end of file
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
new file mode 100644
index 00000000..515e609b
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/WixToolset.Dtf.WindowsInstaller.csproj
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <RootNamespace>WixToolset.Dtf.WindowsInstaller</RootNamespace>
+    <AssemblyName>WixToolset.Dtf.WindowsInstaller</AssemblyName>
+    <TargetFrameworks>netstandard2.0;net20</TargetFrameworks>
+    <Description>Managed libraries for Windows Installer</Description>
+    <CreateDocumentationFile>true</CreateDocumentationFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Errors.resources" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Errors.txt" />
+    <None Include="WindowsInstaller.cd" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)'=='net20' ">
+    <Reference Include="System.Configuration" />
+  </ItemGroup>
+</Project>
diff --git a/src/dtf/WixToolset.Dtf.WindowsInstaller/customactiondata.cs b/src/dtf/WixToolset.Dtf.WindowsInstaller/customactiondata.cs
new file mode 100644
index 00000000..88a0295d
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.WindowsInstaller/customactiondata.cs
@@ -0,0 +1,469 @@
+// 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.Dtf.WindowsInstaller
+{
+    using System;
+    using System.IO;
+    using System.Xml;
+    using System.Xml.Serialization;
+    using System.Text;
+    using System.Collections.Generic;
+    using System.Globalization;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// Contains a collection of key-value pairs suitable for passing between
+    /// immediate and deferred/rollback/commit custom actions.
+    /// </summary>
+    /// <remarks>
+    /// Call the <see cref="CustomActionData.ToString" /> method to get a string
+    /// suitable for storing in a property and reconstructing the custom action data later.
+    /// </remarks>
+    /// <seealso cref="Session.CustomActionData"/>
+    /// <seealso cref="Session.DoAction(string,CustomActionData)"/>
+    [SuppressMessage("Microsoft.Naming", "CA1710:IdentifiersShouldHaveCorrectSuffix")]
+    public sealed class CustomActionData : IDictionary<string, string>
+    {
+        /// <summary>
+        /// "CustomActionData" literal property name.
+        /// </summary>
+        public const string PropertyName = "CustomActionData";
+
+        private const char DataSeparator = ';';
+        private const char KeyValueSeparator = '=';
+
+        private IDictionary<string, string> data;
+
+        /// <summary>
+        /// Creates a new empty custom action data object.
+        /// </summary>
+        public CustomActionData() : this(null)
+        {
+        }
+
+        /// <summary>
+        /// Reconstructs a custom action data object from data that was previously
+        /// persisted in a string.
+        /// </summary>
+        /// <param name="keyValueList">Previous output from <see cref="CustomActionData.ToString" />.</param>
+        public CustomActionData(string keyValueList)
+        {
+            this.data = new Dictionary<string, string>();
+            
+            if (keyValueList != null)
+            {
+                this.Parse(keyValueList);
+            }
+        }
+
+        /// <summary>
+        /// Adds a key and value to the data collection.
+        /// </summary>
+        /// <param name="key">Case-sensitive data key.</param>
+        /// <param name="value">Data value (may be null).</param>
+        /// <exception cref="ArgumentException">the key does not consist solely of letters,
+        /// numbers, and the period, underscore, and space characters.</exception>
+        public void Add(string key, string value)
+        {
+            CustomActionData.ValidateKey(key);
+            this.data.Add(key, value);
+        }
+
+        /// <summary>
+        /// Adds a value to the data collection, using XML serialization to persist the object as a string.
+        /// </summary>
+        /// <param name="key">Case-sensitive data key.</param>
+        /// <param name="value">Data value (may be null).</param>
+        /// <exception cref="ArgumentException">the key does not consist solely of letters,
+        /// numbers, and the period, underscore, and space characters.</exception>
+        /// <exception cref="NotSupportedException">The value type does not support XML serialization.</exception>
+        /// <exception cref="InvalidOperationException">The value could not be serialized.</exception>
+        public void AddObject<T>(string key, T value)
+        {
+            if (value == null)
+            {
+                this.Add(key, null);
+            }
+            else if (typeof(T) == typeof(string) ||
+                     typeof(T) == typeof(CustomActionData)) // Serialize nested CustomActionData
+            {
+                this.Add(key, value.ToString());
+            }
+            else
+            {
+                string valueString = CustomActionData.Serialize<T>(value);
+                this.Add(key, valueString);
+            }
+        }
+
+        /// <summary>
+        /// Gets a value from the data collection, using XML serialization to load the object from a string.
+        /// </summary>
+        /// <param name="key">Case-sensitive data key.</param>
+        /// <exception cref="InvalidOperationException">The value could not be deserialized.</exception>
+        [SuppressMessage("Microsoft.Design", "CA1004:GenericMethodsShouldProvideTypeParameter")]
+        public T GetObject<T>(string key)
+        {
+            string value = this[key];
+            if (value == null)
+            {
+                return default(T);
+            }
+            else if (typeof(T) == typeof(string))
+            {
+                // Funny casting because the compiler doesn't know T is string here.
+                return (T) (object) value;
+            }
+            else if (typeof(T) == typeof(CustomActionData))
+            {
+                // Deserialize nested CustomActionData.
+                return (T) (object) new CustomActionData(value);
+            }
+            else if (value.Length == 0)
+            {
+                return default(T);
+            }
+            else
+            {
+                return CustomActionData.Deserialize<T>(value);
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the data contains an item with the specified key.
+        /// </summary>
+        /// <param name="key">Case-sensitive data key.</param>
+        /// <returns>true if the data contains an item with the key; otherwise, false</returns>
+        public bool ContainsKey(string key)
+        {
+            return this.data.ContainsKey(key);
+        }
+
+        /// <summary>
+        /// Gets a collection object containing all the keys of the data.
+        /// </summary>
+        public ICollection<string> Keys
+        {
+            get
+            {
+                return this.data.Keys;
+            }
+        }
+
+        /// <summary>
+        /// Removes the item with the specified key from the data.
+        /// </summary>
+        /// <param name="key">Case-sensitive data key.</param>
+        /// <returns>true if the item was successfully removed from the data;
+        /// false if an item with the specified key was not found</returns>
+        public bool Remove(string key)
+        {
+            return this.data.Remove(key);
+        }
+
+        /// <summary>
+        /// Gets the value with the specified key.
+        /// </summary>
+        /// <param name="key">Case-sensitive data key.</param>
+        /// <param name="value">Value associated with the specified key, or
+        /// null if an item with the specified key was not found</param>
+        /// <returns>true if the data contains an item with the specified key; otherwise, false.</returns>
+        public bool TryGetValue(string key, out string value)
+        {
+            return this.data.TryGetValue(key, out value);
+        }
+
+        /// <summary>
+        /// Gets a collection containing all the values of the data.
+        /// </summary>
+        public ICollection<string> Values
+        {
+            get
+            {
+                return this.data.Values;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a data value with a specified key.
+        /// </summary>
+        /// <param name="key">Case-sensitive data key.</param>
+        /// <exception cref="ArgumentException">the key does not consist solely of letters,
+        /// numbers, and the period, underscore, and space characters.</exception>
+        public string this[string key]
+        {
+            get
+            {
+                return this.data[key];
+            }
+            set
+            {
+                CustomActionData.ValidateKey(key);
+                this.data[key] = value;
+            }
+        }
+
+        /// <summary>
+        /// Adds an item with key and value to the data collection.
+        /// </summary>
+        /// <param name="item">Case-sensitive data key, with a data value that may be null.</param>
+        /// <exception cref="ArgumentException">the key does not consist solely of letters,
+        /// numbers, and the period, underscore, and space characters.</exception>
+        public void Add(KeyValuePair<string, string> item)
+        {
+            CustomActionData.ValidateKey(item.Key);
+            this.data.Add(item);
+        }
+
+        /// <summary>
+        /// Removes all items from the data.
+        /// </summary>
+        public void Clear()
+        {
+            if (this.data.Count > 0)
+            {
+                this.data.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Determines whether the data contains a specified item.
+        /// </summary>
+        /// <param name="item">The data item to locate.</param>
+        /// <returns>true if the data contains the item; otherwise, false</returns>
+        public bool Contains(KeyValuePair<string, string> item)
+        {
+            return this.data.Contains(item);
+        }
+
+        /// <summary>
+        /// Copies the data to an array, starting at a particular array index.
+        /// </summary>
+        /// <param name="array">Destination array.</param>
+        /// <param name="arrayIndex">Index in the array at which copying begins.</param>
+        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex)
+        {
+            this.data.CopyTo(array, arrayIndex);
+        }
+
+        /// <summary>
+        /// Gets the number of items in the data.
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return this.data.Count;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the data is read-only.
+        /// </summary>
+        public bool IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Removes an item from the data.
+        /// </summary>
+        /// <param name="item">The item to remove.</param>
+        /// <returns>true if the item was successfully removed from the data;
+        /// false if the item was not found</returns>
+        public bool Remove(KeyValuePair<string, string> item)
+        {
+            return this.data.Remove(item);
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the collection.
+        /// </summary>
+        /// <returns>An enumerator that can be used to iterate through the collection.</returns>
+        public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
+        {
+            return this.data.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Returns an enumerator that iterates through the collection.
+        /// </summary>
+        /// <returns>An enumerator that can be used to iterate through the collection.</returns>
+        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        {
+            return ((System.Collections.IEnumerable) this.data).GetEnumerator();
+        }
+
+        /// <summary>
+        /// Gets a string representation of the data suitable for persisting in a property.
+        /// </summary>
+        /// <returns>Data string in the form "Key1=Value1;Key2=Value2"</returns>
+        public override string ToString()
+        {
+            StringBuilder buf = new StringBuilder();
+
+            foreach (KeyValuePair<string, string> item in this.data)
+            {
+                if (buf.Length > 0)
+                {
+                    buf.Append(CustomActionData.DataSeparator);
+                }
+
+                buf.Append(item.Key);
+
+                if (item.Value != null)
+                {
+                    buf.Append(CustomActionData.KeyValueSeparator);
+                    buf.Append(CustomActionData.Escape(item.Value));
+                }
+            }
+
+            return buf.ToString();
+        }
+
+        /// <summary>
+        /// Ensures that a key contains valid characters.
+        /// </summary>
+        /// <param name="key">key to be validated</param>
+        /// <exception cref="ArgumentException">the key does not consist solely of letters,
+        /// numbers, and the period, underscore, and space characters.</exception>
+        private static void ValidateKey(string key)
+        {
+            if (String.IsNullOrEmpty(key))
+            {
+                throw new ArgumentNullException("key");
+            }
+
+            for (int i = 0; i < key.Length; i++)
+            {
+                char c = key[i];
+                if (!Char.IsLetterOrDigit(c) && c != '_' && c != '.' &&
+                    !(i > 0 && i < key.Length - 1 && c == ' '))
+                {
+                    throw new ArgumentOutOfRangeException("key");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Serializes a value into an XML string.
+        /// </summary>
+        /// <typeparam name="T">Type of the value.</typeparam>
+        /// <param name="value">Value to be serialized.</param>
+        /// <returns>Serialized value data as a string.</returns>
+        private static string Serialize<T>(T value)
+        {
+            XmlWriterSettings xws = new XmlWriterSettings();
+            xws.OmitXmlDeclaration = true;
+
+            StringWriter sw = new StringWriter(CultureInfo.InvariantCulture);
+            using (XmlWriter xw = XmlWriter.Create(sw, xws))
+            {
+                XmlSerializerNamespaces ns = new XmlSerializerNamespaces();
+                ns.Add(string.Empty, String.Empty); // Prevent output of any namespaces
+
+                XmlSerializer ser = new XmlSerializer(typeof(T));
+                ser.Serialize(xw, value, ns);
+
+                return sw.ToString();
+            }
+        }
+
+        /// <summary>
+        /// Deserializes a value from an XML string.
+        /// </summary>
+        /// <typeparam name="T">Expected type of the value.</typeparam>
+        /// <param name="value">Serialized value data.</param>
+        /// <returns>Deserialized value object.</returns>
+        private static T Deserialize<T>(string value)
+        {
+            StringReader sr = new StringReader(value);
+            using (XmlReader xr = XmlReader.Create(sr))
+            {
+                XmlSerializer ser = new XmlSerializer(typeof(T));
+                return (T) ser.Deserialize(xr);
+            }
+        }
+
+        /// <summary>
+        /// Escapes a value string by doubling any data-separator (semicolon) characters.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns>Escaped value string</returns>
+        private static string Escape(string value)
+        {
+            value = value.Replace(String.Empty + CustomActionData.DataSeparator, String.Empty + CustomActionData.DataSeparator + CustomActionData.DataSeparator);
+            return value;
+        }
+
+        /// <summary>
+        /// Unescapes a value string by undoubling any doubled data-separator (semicolon) characters.
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns>Unescaped value string</returns>
+        private static string Unescape(string value)
+        {
+            value = value.Replace(String.Empty + CustomActionData.DataSeparator + CustomActionData.DataSeparator, String.Empty + CustomActionData.DataSeparator);
+            return value;
+        }
+
+        /// <summary>
+        /// Loads key-value pairs from a string into the data collection.
+        /// </summary>
+        /// <param name="keyValueList">key-value pair list of the form returned by <see cref="ToString"/></param>
+        private void Parse(string keyValueList)
+        {
+            int itemStart = 0;
+            while (itemStart < keyValueList.Length)
+            {
+                // Find the next non-escaped data separator.
+                int semi = itemStart - 2;
+                do
+                {
+                    semi = keyValueList.IndexOf(CustomActionData.DataSeparator, semi + 2);
+                }
+                while (semi >= 0 && semi < keyValueList.Length - 1 && keyValueList[semi + 1] == CustomActionData.DataSeparator);
+
+                if (semi < 0)
+                {
+                    semi = keyValueList.Length;
+                }
+
+                // Find the next non-escaped key-value separator.
+                int equals = itemStart - 2;
+                do
+                {
+                    equals = keyValueList.IndexOf(CustomActionData.KeyValueSeparator, equals + 2);
+                }
+                while (equals >= 0 && equals < keyValueList.Length - 1 && keyValueList[equals + 1] == CustomActionData.KeyValueSeparator);
+
+                if (equals < 0 || equals > semi)
+                {
+                    equals = semi;
+                }
+
+                string key = keyValueList.Substring(itemStart, equals - itemStart);
+                string value = null;
+
+                // If there's a key-value separator before the next data separator, then the item has a value.
+                if (equals < semi)
+                {
+                    value = keyValueList.Substring(equals + 1, semi - (equals + 1));
+                    value = CustomActionData.Unescape(value);
+                }
+
+                // Add non-duplicate items to the collection.
+                if (key.Length > 0 && !this.data.ContainsKey(key))
+                {
+                    this.data.Add(key, value);
+                }
+
+                // Move past the data separator to the next item.
+                itemStart = semi + 1;
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolset.Dtf.sln b/src/dtf/WixToolset.Dtf.sln
new file mode 100644
index 00000000..7e58ad8d
--- /dev/null
+++ b/src/dtf/WixToolset.Dtf.sln
@@ -0,0 +1,281 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26730.8
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression", "src\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj", "{2D62850C-9F81-4BE9-BDF3-9379389C8F7B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression.Cab", "src\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj", "{15895FD1-DD68-407B-8717-08F6DD14F02C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Compression.Zip", "src\WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj", "{261F2857-B521-42A4-A3E0-B5165F225E50}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.Resources", "src\WixToolset.Dtf.Resources\WixToolset.Dtf.Resources.csproj", "{44931ECB-8D6F-4C12-A872-64E261B6A98E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller", "src\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj", "{24121677-0ED0-41B5-833F-1B9A18E87BF4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller.Linq", "src\WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj", "{CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dtf.WindowsInstaller.Package", "src\WixToolset.Dtf.WindowsInstaller.Package\WixToolset.Dtf.WindowsInstaller.Package.csproj", "{1A9940A7-3E29-4428-B753-C4CC66058F1A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression", "src\WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj", "{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Cab", "src\WixToolsetTests.Dtf.Compression.Cab\WixToolsetTests.Dtf.Compression.Cab.csproj", "{4544158C-2D63-4146-85FF-62169280144E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.Compression.Zip", "src\WixToolsetTests.Dtf.Compression.Zip\WixToolsetTests.Dtf.Compression.Zip.csproj", "{328799BB-7B03-4B28-8180-4132211FD07D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller", "src\WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj", "{16F5202F-9276-4166-975C-C9654BAF8012}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.CustomActions", "src\WixToolsetTests.Dtf.WindowsInstaller.CustomActions\WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj", "{137D376B-989F-4FEA-9A67-01D8D38CA0DE}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolsetTests.Dtf.WindowsInstaller.Linq", "src\WixToolsetTests.Dtf.WindowsInstaller.Linq\WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj", "{4F55F9B8-D8B6-41EB-8796-221B4CD98324}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{A988A768-200F-408F-AE3B-5D9B14AA48EE}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SfxCA", "src\Tools\SfxCA\SfxCA.vcxproj", "{55D5BA28-D427-4F53-80C2-FE9EF23C1553}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MakeSfxCA", "src\Tools\MakeSfxCA\MakeSfxCA.csproj", "{3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{4A47EC94-8234-4479-87BC-3D924DB7AA4E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ManagedCA", "src\Samples\ManagedCA\ManagedCA.csproj", "{DB9E5F02-8241-440A-9B60-980EB5B42B13}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbeddedUI", "src\Samples\EmbeddedUI\EmbeddedUI.csproj", "{864B8C50-7895-4485-AC89-900D86FD8C0D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dtf.MSBuild", "src\WixToolset.Dtf.MSBuild\WixToolset.Dtf.MSBuild.csproj", "{E7A00377-A0B5-400F-8337-C0814AAC7153}"
+EndProject
+Global
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|Any CPU = Debug|Any CPU
+                Debug|x64 = Debug|x64
+                Debug|x86 = Debug|x86
+                Release|Any CPU = Release|Any CPU
+                Release|x64 = Release|x64
+                Release|x86 = Release|x86
+        EndGlobalSection
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Debug|x64.Build.0 = Debug|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Debug|x86.Build.0 = Debug|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Release|Any CPU.Build.0 = Release|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Release|x64.ActiveCfg = Release|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Release|x64.Build.0 = Release|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Release|x86.ActiveCfg = Release|Any CPU
+                {2D62850C-9F81-4BE9-BDF3-9379389C8F7B}.Release|x86.Build.0 = Release|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Debug|x64.Build.0 = Debug|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Debug|x86.Build.0 = Debug|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Release|Any CPU.Build.0 = Release|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Release|x64.ActiveCfg = Release|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Release|x64.Build.0 = Release|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Release|x86.ActiveCfg = Release|Any CPU
+                {15895FD1-DD68-407B-8717-08F6DD14F02C}.Release|x86.Build.0 = Release|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Debug|x64.Build.0 = Debug|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Debug|x86.Build.0 = Debug|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Release|Any CPU.Build.0 = Release|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Release|x64.ActiveCfg = Release|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Release|x64.Build.0 = Release|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Release|x86.ActiveCfg = Release|Any CPU
+                {261F2857-B521-42A4-A3E0-B5165F225E50}.Release|x86.Build.0 = Release|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Debug|x64.Build.0 = Debug|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Debug|x86.Build.0 = Debug|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Release|Any CPU.Build.0 = Release|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Release|x64.ActiveCfg = Release|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Release|x64.Build.0 = Release|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Release|x86.ActiveCfg = Release|Any CPU
+                {44931ECB-8D6F-4C12-A872-64E261B6A98E}.Release|x86.Build.0 = Release|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Debug|x64.Build.0 = Debug|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Debug|x86.Build.0 = Debug|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Release|Any CPU.Build.0 = Release|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Release|x64.ActiveCfg = Release|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Release|x64.Build.0 = Release|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Release|x86.ActiveCfg = Release|Any CPU
+                {24121677-0ED0-41B5-833F-1B9A18E87BF4}.Release|x86.Build.0 = Release|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Debug|x64.Build.0 = Debug|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Debug|x86.Build.0 = Debug|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Release|Any CPU.Build.0 = Release|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Release|x64.ActiveCfg = Release|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Release|x64.Build.0 = Release|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Release|x86.ActiveCfg = Release|Any CPU
+                {CD7A37D8-9D8C-41BD-B78F-DB5E0C299D2E}.Release|x86.Build.0 = Release|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Debug|x64.Build.0 = Debug|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Debug|x86.Build.0 = Debug|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Release|Any CPU.Build.0 = Release|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Release|x64.ActiveCfg = Release|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Release|x64.Build.0 = Release|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Release|x86.ActiveCfg = Release|Any CPU
+                {1A9940A7-3E29-4428-B753-C4CC66058F1A}.Release|x86.Build.0 = Release|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|x64.Build.0 = Debug|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Debug|x86.Build.0 = Debug|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|Any CPU.Build.0 = Release|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|x64.ActiveCfg = Release|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|x64.Build.0 = Release|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|x86.ActiveCfg = Release|Any CPU
+                {F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}.Release|x86.Build.0 = Release|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Debug|x64.Build.0 = Debug|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Debug|x86.Build.0 = Debug|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Release|x64.ActiveCfg = Release|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Release|x64.Build.0 = Release|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Release|x86.ActiveCfg = Release|Any CPU
+                {4544158C-2D63-4146-85FF-62169280144E}.Release|x86.Build.0 = Release|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|x64.Build.0 = Debug|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Debug|x86.Build.0 = Debug|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Release|Any CPU.Build.0 = Release|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Release|x64.ActiveCfg = Release|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Release|x64.Build.0 = Release|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Release|x86.ActiveCfg = Release|Any CPU
+                {328799BB-7B03-4B28-8180-4132211FD07D}.Release|x86.Build.0 = Release|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|x64.Build.0 = Debug|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Debug|x86.Build.0 = Debug|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Release|Any CPU.Build.0 = Release|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Release|x64.ActiveCfg = Release|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Release|x64.Build.0 = Release|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Release|x86.ActiveCfg = Release|Any CPU
+                {16F5202F-9276-4166-975C-C9654BAF8012}.Release|x86.Build.0 = Release|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|x64.Build.0 = Debug|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Debug|x86.Build.0 = Debug|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|Any CPU.Build.0 = Release|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|x64.ActiveCfg = Release|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|x64.Build.0 = Release|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|x86.ActiveCfg = Release|Any CPU
+                {137D376B-989F-4FEA-9A67-01D8D38CA0DE}.Release|x86.Build.0 = Release|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|x64.Build.0 = Debug|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Debug|x86.Build.0 = Debug|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|Any CPU.Build.0 = Release|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x64.ActiveCfg = Release|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x64.Build.0 = Release|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x86.ActiveCfg = Release|Any CPU
+                {4F55F9B8-D8B6-41EB-8796-221B4CD98324}.Release|x86.Build.0 = Release|Any CPU
+                {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Debug|Any CPU.ActiveCfg = Debug|Win32
+                {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Debug|x64.ActiveCfg = Debug|Win32
+                {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Debug|x86.ActiveCfg = Debug|Win32
+                {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Debug|x86.Build.0 = Debug|Win32
+                {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Release|Any CPU.ActiveCfg = Release|Win32
+                {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Release|x64.ActiveCfg = Release|x64
+                {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Release|x86.ActiveCfg = Release|Win32
+                {55D5BA28-D427-4F53-80C2-FE9EF23C1553}.Release|x86.Build.0 = Release|Win32
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|x64.Build.0 = Debug|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Debug|x86.Build.0 = Debug|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|Any CPU.Build.0 = Release|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|x64.ActiveCfg = Release|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|x64.Build.0 = Release|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|x86.ActiveCfg = Release|Any CPU
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B}.Release|x86.Build.0 = Release|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|x64.Build.0 = Debug|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Debug|x86.Build.0 = Debug|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|Any CPU.Build.0 = Release|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|x64.ActiveCfg = Release|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|x64.Build.0 = Release|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|x86.ActiveCfg = Release|Any CPU
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13}.Release|x86.Build.0 = Release|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|x64.Build.0 = Debug|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Debug|x86.Build.0 = Debug|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|Any CPU.Build.0 = Release|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|x64.ActiveCfg = Release|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|x64.Build.0 = Release|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|x86.ActiveCfg = Release|Any CPU
+                {864B8C50-7895-4485-AC89-900D86FD8C0D}.Release|x86.Build.0 = Release|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x64.ActiveCfg = Debug|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x64.Build.0 = Debug|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x86.ActiveCfg = Debug|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Debug|x86.Build.0 = Debug|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|Any CPU.Build.0 = Release|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x64.ActiveCfg = Release|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x64.Build.0 = Release|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x86.ActiveCfg = Release|Any CPU
+                {E7A00377-A0B5-400F-8337-C0814AAC7153}.Release|x86.Build.0 = Release|Any CPU
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(NestedProjects) = preSolution
+                {55D5BA28-D427-4F53-80C2-FE9EF23C1553} = {A988A768-200F-408F-AE3B-5D9B14AA48EE}
+                {3F246CE0-153D-4AC3-B6AC-5EAD8E2AD04B} = {A988A768-200F-408F-AE3B-5D9B14AA48EE}
+                {DB9E5F02-8241-440A-9B60-980EB5B42B13} = {4A47EC94-8234-4479-87BC-3D924DB7AA4E}
+                {864B8C50-7895-4485-AC89-900D86FD8C0D} = {4A47EC94-8234-4479-87BC-3D924DB7AA4E}
+        EndGlobalSection
+        GlobalSection(ExtensibilityGlobals) = postSolution
+                SolutionGuid = {BB57C98D-C0C2-4805-AED3-C19B47759DBD}
+        EndGlobalSection
+EndGlobal
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/CabTest.cs b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/CabTest.cs
new file mode 100644
index 00000000..981ecc69
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/CabTest.cs
@@ -0,0 +1,1165 @@
+// 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.Dtf.Test
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Threading;
+    using System.Collections.Generic;
+    using System.Runtime.Serialization;
+    using System.Runtime.Serialization.Formatters.Binary;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixToolset.Dtf.Compression;
+    using WixToolset.Dtf.Compression.Cab;
+
+    [TestClass]
+    public class CabTest
+    {
+        public CabTest()
+        {
+        }
+
+        [TestInitialize]
+        public void Initialize()
+        {
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+        }
+
+        [TestMethod]
+        public void CabinetMultithread()
+        {
+            this.multithreadExceptions = new List<Exception>();
+
+            const int threadCount = 10;
+            IList<Thread> threads = new List<Thread>(threadCount);
+
+            for (int i = 0; i < threadCount; i++)
+            {
+                Thread thread = new Thread(new ThreadStart(this.CabinetMultithreadWorker));
+                thread.Name = "CabinetMultithreadWorker_" + i;
+                threads.Add(thread);
+            }
+
+            foreach (Thread thread in threads)
+            {
+                thread.Start();
+            }
+
+            foreach (Thread thread in threads)
+            {
+                thread.Join();
+            }
+
+            foreach (Exception ex in this.multithreadExceptions)
+            {
+                Console.WriteLine();
+                Console.WriteLine(ex);
+            }
+            Assert.AreEqual<int>(0, this.multithreadExceptions.Count);
+        }
+
+        private IList<Exception> multithreadExceptions;
+
+        private void CabinetMultithreadWorker()
+        {
+            try
+            {
+                string threadName = Thread.CurrentThread.Name;
+                int threadNumber = Int32.Parse(threadName.Substring(threadName.IndexOf('_') + 1));
+                this.RunCabinetPackUnpack(100, 10240 + threadNumber, 0, 0, CompressionLevel.Normal);
+            }
+            catch (Exception ex)
+            {
+                this.multithreadExceptions.Add(ex);
+            }
+        }
+
+        [TestMethod]
+        public void CabinetFileCounts()
+        {
+            this.RunCabinetPackUnpack(0, 10, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 10, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(100, 10, 0, 0, CompressionLevel.Normal);
+        }
+
+        [TestMethod]
+        [Ignore] // Takes ~5 minutes and 66000 is over the 65535 limit anyway.
+        public void CabinetExtremeFileCounts()
+        {
+            this.RunCabinetPackUnpack(66000, 10);
+        }
+
+        [TestMethod]
+        public void CabinetFileSizes()
+        {
+            this.RunCabinetPackUnpack(1, 0, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 1, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 2, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 3, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 4, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 5, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 6, 0, 0, CompressionLevel.Normal);
+            // Skip file sizes 7-9: see "buggy" file sizes test below.
+            this.RunCabinetPackUnpack(1, 10, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 11, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 12, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 100 * 1024, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 10 * 1024 * 1024, 0, 0, CompressionLevel.Normal);
+        }
+
+        [TestMethod]
+        public void CabinetBuggyFileSizes()
+        {
+            // Windows' cabinet.dll has a known bug (#55001 in Windows OS Bugs) 
+            // LZX compression causes an AV with file sizes of 7, 8, or 9 bytes.
+            try
+            {
+                this.RunCabinetPackUnpack(1, 7, 0, 0, CompressionLevel.Normal);
+                this.RunCabinetPackUnpack(1, 8, 0, 0, CompressionLevel.Normal);
+                this.RunCabinetPackUnpack(1, 9, 0, 0, CompressionLevel.Normal);
+            }
+            catch (AccessViolationException)
+            {
+                Assert.Fail("Known 7,8,9 file size bug detected in Windows' cabinet.dll.");
+            }
+        }
+
+        [Timeout(36000000), TestMethod]
+        [Ignore] // Takes too long to run regularly.
+        public void CabinetExtremeFileSizes()
+        {
+            this.RunCabinetPackUnpack(10, 512L * 1024 * 1024); // 5GB
+            //this.RunCabinetPackUnpack(1, 5L * 1024 * 1024 * 1024); // 5GB
+        }
+
+        [TestMethod]
+        public void CabinetFolders()
+        {
+            this.RunCabinetPackUnpack(0, 10, 1, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(1, 10, 1, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(100, 10, 1, 0, CompressionLevel.Normal);
+
+            IList<ArchiveFileInfo> fileInfo;
+            fileInfo = this.RunCabinetPackUnpack(7, 100 * 1024, 250 * 1024, 0, CompressionLevel.None);
+            Assert.AreEqual<int>(2, ((CabFileInfo) fileInfo[fileInfo.Count - 1]).CabinetFolderNumber,
+                "Testing whether cabinet has the correct # of folders.");
+
+            fileInfo = this.RunCabinetPackUnpack(10, 100 * 1024, 250 * 1024, 0, CompressionLevel.None);
+            Assert.AreEqual<int>(3, ((CabFileInfo) fileInfo[fileInfo.Count - 1]).CabinetFolderNumber,
+                "Testing whether cabinet has the correct # of folders.");
+
+            fileInfo = this.RunCabinetPackUnpack(2, 100 * 1024, 40 * 1024, 0, CompressionLevel.None);
+            Assert.AreEqual<int>(1, ((CabFileInfo) fileInfo[fileInfo.Count - 1]).CabinetFolderNumber,
+                "Testing whether cabinet has the correct # of folders.");
+        }
+
+        [TestMethod]
+        public void CabinetArchiveCounts()
+        {
+            IList<ArchiveFileInfo> fileInfo;
+            fileInfo = this.RunCabinetPackUnpack(10, 100 * 1024, 0, 400 * 1024, CompressionLevel.None);
+            Assert.AreEqual<int>(2, fileInfo[fileInfo.Count - 1].ArchiveNumber,
+                "Testing whether archive spans the correct # of cab files.");
+
+            fileInfo = this.RunCabinetPackUnpack(2, 90 * 1024, 0, 40 * 1024, CompressionLevel.None);
+            Assert.AreEqual<int>(2, fileInfo[fileInfo.Count - 1].ArchiveNumber,
+                "Testing whether archive spans the correct # of cab files.");
+        }
+
+        [TestMethod]
+        public void CabinetProgress()
+        {
+            CompressionTestUtil.ExpectedProgress = new List<int[]>(new int[][] {
+                //            StatusType,  CurFile,TotalFiles,CurFolder,CurCab,TotalCabs
+                new int[] { (int)     ArchiveProgressType.StartFile,   0, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  0, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   1, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  1, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   2, 15, 1, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  2, 15, 1, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   3, 15, 1, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  3, 15, 1, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   4, 15, 2, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  4, 15, 2, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   5, 15, 2, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  5, 15, 2, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   6, 15, 3, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  6, 15, 3, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   7, 15, 3, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  7, 15, 3, 0, 1 },
+                new int[] { (int) ArchiveProgressType.StartArchive,    7, 15, 3, 0, 1 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,   7, 15, 3, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   8, 15, 4, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  8, 15, 4, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   9, 15, 4, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  9, 15, 4, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  10, 15, 5, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 10, 15, 5, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  11, 15, 5, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 11, 15, 5, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  12, 15, 6, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 12, 15, 6, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  13, 15, 6, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 13, 15, 6, 1, 2 },
+                new int[] { (int) ArchiveProgressType.StartArchive,   13, 15, 6, 1, 2 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,  13, 15, 6, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  14, 15, 7, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 14, 15, 7, 2, 3 },
+                new int[] { (int) ArchiveProgressType.StartArchive,   14, 15, 7, 2, 3 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,  14, 15, 7, 2, 3 },
+                //            StatusType,  CurFile,TotalFiles,CurFolder,CurCab,TotalCabs
+                new int[] { (int) ArchiveProgressType.StartArchive,    0, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   0, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  0, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   1, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  1, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   2, 15, 1, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  2, 15, 1, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   3, 15, 1, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  3, 15, 1, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   4, 15, 2, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  4, 15, 2, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   5, 15, 2, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  5, 15, 2, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   6, 15, 3, 0, 3 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,   6, 15, 3, 0, 3 },
+                new int[] { (int) ArchiveProgressType.StartArchive,    6, 15, 3, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  6, 15, 3, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   7, 15, 3, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  7, 15, 3, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   8, 15, 4, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  8, 15, 4, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   9, 15, 4, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  9, 15, 4, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  10, 15, 5, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 10, 15, 5, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  11, 15, 5, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 11, 15, 5, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  12, 15, 6, 1, 3 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,  12, 15, 6, 1, 3 },
+                new int[] { (int) ArchiveProgressType.StartArchive,   12, 15, 6, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 12, 15, 6, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  13, 15, 6, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 13, 15, 6, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  14, 15, 7, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 14, 15, 7, 2, 3 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,  14, 15, 7, 2, 3 },
+            });
+
+            try
+            {
+                this.RunCabinetPackUnpack(15, 20 * 1024, 1 * 1024, 130 * 1024, CompressionLevel.None);
+            }
+            finally
+            {
+                CompressionTestUtil.ExpectedProgress = null;
+            }
+        }
+
+        [TestMethod]
+        public void CabArchiveSizeParam()
+        {
+            Console.WriteLine("Testing various values for the maxArchiveSize parameter.");
+            this.RunCabinetPackUnpack(5,  1024, 0, Int64.MinValue);
+            this.RunCabinetPackUnpack(5,  1024, 0, -1);
+            this.RunCabinetPackUnpack(5,    10, 0, 2);
+            this.RunCabinetPackUnpack(5,   100, 0, 256);
+            this.RunCabinetPackUnpack(5, 24000, 0, 32768);
+            this.RunCabinetPackUnpack(5,  1024, 0, Int64.MaxValue);
+        }
+
+        [TestMethod]
+        public void CabFolderSizeParam()
+        {
+            Console.WriteLine("Testing various values for the maxFolderSize parameter.");
+            this.RunCabinetPackUnpack(5, 10, Int64.MinValue, 0);
+            this.RunCabinetPackUnpack(5, 10, -1, 0);
+            this.RunCabinetPackUnpack(5, 10, 2, 0);
+            this.RunCabinetPackUnpack(5, 10, 16, 0);
+            this.RunCabinetPackUnpack(5, 10, 100, 0);
+            this.RunCabinetPackUnpack(5, 10, Int64.MaxValue, 0);
+        }
+
+        [TestMethod]
+        public void CabCompLevelParam()
+        {
+            Console.WriteLine("Testing various values for the compressionLevel parameter.");
+            this.RunCabinetPackUnpack(5, 1024, 0, 0, CompressionLevel.None);
+            this.RunCabinetPackUnpack(5, 1024, 0, 0, CompressionLevel.Min);
+            this.RunCabinetPackUnpack(5, 1024, 0, 0, CompressionLevel.Normal);
+            this.RunCabinetPackUnpack(5, 1024, 0, 0, CompressionLevel.Max);
+            this.RunCabinetPackUnpack(5, 1024, 0, 0, (CompressionLevel) ((int) CompressionLevel.None - 1));
+            this.RunCabinetPackUnpack(5, 1024, 0, 0, (CompressionLevel) ((int) CompressionLevel.Max + 1));
+            this.RunCabinetPackUnpack(5, 1024, 0, 0, (CompressionLevel) Int32.MinValue);
+            this.RunCabinetPackUnpack(5, 1024, 0, 0, (CompressionLevel) Int32.MaxValue);
+        }
+
+        [TestMethod]
+        public void CabEngineNullParams()
+        {
+            string[] testFiles = new string[] { "test.txt" };
+            ArchiveFileStreamContext streamContext = new ArchiveFileStreamContext("test.cab", null, null);
+
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                cabEngine.CompressionLevel = CompressionLevel.None;
+
+                CompressionTestUtil.TestCompressionEngineNullParams(
+                    cabEngine, streamContext, testFiles);
+            }
+        }
+
+        [TestMethod]
+        public void CabBadPackStreamContexts()
+        {
+            string[] testFiles = new string[] { "test.txt" };
+            CompressionTestUtil.GenerateRandomFile(testFiles[0], 0, 20000);
+
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                cabEngine.CompressionLevel = CompressionLevel.None;
+
+                CompressionTestUtil.TestBadPackStreamContexts(cabEngine, "test.cab", testFiles);
+            }
+        }
+
+        [TestMethod]
+        public void CabEngineNoTempFileTest()
+        {
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("testnotemp.txt", 0, txtSize);
+
+            ArchiveFileStreamContext streamContext = new ArchiveFileStreamContext("testnotemp.cab", null, null);
+
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                cabEngine.UseTempFiles = false;
+                cabEngine.Pack(streamContext, new string[] { "testnotemp.txt" });
+            }
+
+            new CabInfo("testnotemp.cab").UnpackFile("testnotemp.txt", "testnotemp2.txt");
+            Assert.AreEqual(txtSize, new FileInfo("testnotemp2.txt").Length);
+        }
+
+        [TestMethod]
+        public void CabExtractorIsCabinet()
+        {
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("test.txt", 0, txtSize);
+            new CabInfo("test.cab").PackFiles(null, new string[] { "test.txt" }, null);
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                bool isCab;
+                using (Stream fileStream = File.OpenRead("test.txt"))
+                {
+                    isCab = cabEngine.IsArchive(fileStream);
+                }
+                Assert.IsFalse(isCab);
+                using (Stream cabStream = File.OpenRead("test.cab"))
+                {
+                    isCab = cabEngine.IsArchive(cabStream);
+                }
+                Assert.IsTrue(isCab);
+                using (Stream cabStream = File.OpenRead("test.cab"))
+                {
+                    using (Stream fileStream = new FileStream("test.txt", FileMode.Open, FileAccess.ReadWrite))
+                    {
+                        fileStream.Seek(0, SeekOrigin.End);
+                        byte[] buf = new byte[1024];
+                        int count;
+                        while ((count = cabStream.Read(buf, 0, buf.Length)) > 0)
+                        {
+                            fileStream.Write(buf, 0, count);
+                        }
+                        fileStream.Seek(0, SeekOrigin.Begin);
+                        isCab = cabEngine.IsArchive(fileStream);
+                    }
+                }
+                Assert.IsFalse(isCab);
+                using (Stream fileStream = new FileStream("test.txt", FileMode.Open, FileAccess.ReadWrite))
+                {
+                    fileStream.Write(new byte[] { (byte) 'M', (byte) 'S', (byte) 'C', (byte) 'F' }, 0, 4);
+                    fileStream.Seek(0, SeekOrigin.Begin);
+                    isCab = cabEngine.IsArchive(fileStream);
+                }
+                Assert.IsFalse(isCab);
+            }
+        }
+
+        [TestMethod]
+        public void CabExtractorFindOffset()
+        {
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("test.txt", 0, txtSize);
+            new CabInfo("test.cab").PackFiles(null, new string[] { "test.txt" }, null);
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                long offset;
+                using (Stream fileStream = File.OpenRead("test.txt"))
+                {
+                    offset = cabEngine.FindArchiveOffset(fileStream);
+                }
+                Assert.AreEqual<long>(-1, offset);
+                using (Stream cabStream = File.OpenRead("test.cab"))
+                {
+                    using (Stream fileStream = new FileStream("test.txt", FileMode.Open, FileAccess.ReadWrite))
+                    {
+                        fileStream.Seek(0, SeekOrigin.End);
+                        byte[] buf = new byte[1024];
+                        int count;
+                        while ((count = cabStream.Read(buf, 0, buf.Length)) > 0)
+                        {
+                            fileStream.Write(buf, 0, count);
+                        }
+                        fileStream.Seek(0, SeekOrigin.Begin);
+                        offset = cabEngine.FindArchiveOffset(fileStream);
+                    }
+                }
+                Assert.AreEqual<long>(txtSize, offset);
+            }
+        }
+
+        [TestMethod]
+        public void CabExtractorGetFiles()
+        {
+            IList<ArchiveFileInfo> fileInfo;
+            CabInfo cabInfo = new CabInfo("testgetfiles.cab");
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("testgetfiles0.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("testgetfiles1.txt", 1, txtSize);
+            cabInfo.PackFiles(null, new string[] { "testgetfiles0.txt", "testgetfiles1.txt" }, null);
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                IList<string> files;
+                using (Stream cabStream = File.OpenRead("testgetfiles.cab"))
+                {
+                    files = cabEngine.GetFiles(cabStream);
+                }
+                Assert.IsNotNull(files);
+                Assert.AreEqual<int>(2, files.Count);
+                Assert.AreEqual<string>("testgetfiles0.txt", files[0]);
+                Assert.AreEqual<string>("testgetfiles1.txt", files[1]);
+
+                using (Stream cabStream = File.OpenRead("testgetfiles.cab"))
+                {
+                    files = cabEngine.GetFiles(new ArchiveFileStreamContext("testgetfiles.cab"), null);
+                }
+                Assert.IsNotNull(files);
+                Assert.AreEqual<int>(2, files.Count);
+                Assert.AreEqual<string>("testgetfiles0.txt", files[0]);
+                Assert.AreEqual<string>("testgetfiles1.txt", files[1]);
+
+                using (Stream cabStream = File.OpenRead("testgetfiles.cab"))
+                {
+                    fileInfo = cabEngine.GetFileInfo(cabStream);
+                }
+                Assert.IsNotNull(fileInfo);
+                Assert.AreEqual<int>(2, fileInfo.Count);
+                Assert.AreEqual<string>("testgetfiles0.txt", fileInfo[0].Name);
+                Assert.AreEqual<string>("testgetfiles1.txt", fileInfo[1].Name);
+                using (Stream cabStream = File.OpenRead("testgetfiles.cab"))
+                {
+                    fileInfo = cabEngine.GetFileInfo(new ArchiveFileStreamContext("testgetfiles.cab"),  null);
+                }
+                Assert.IsNotNull(fileInfo);
+                Assert.AreEqual<int>(2, fileInfo.Count);
+                Assert.AreEqual<string>("testgetfiles0.txt", fileInfo[0].Name);
+                Assert.AreEqual<string>("testgetfiles1.txt", fileInfo[1].Name);
+            }
+
+            fileInfo = this.RunCabinetPackUnpack(15, 20 * 1024, 1 * 1024, 130 * 1024);
+            Assert.IsNotNull(fileInfo);
+            Assert.AreEqual<int>(15, fileInfo.Count);
+            for (int i = 0; i < fileInfo.Count; i++)
+            {
+                Assert.IsNull(fileInfo[i].Archive);
+                Assert.AreEqual<string>(TEST_FILENAME_PREFIX + i + ".txt", fileInfo[i].Name);
+                Assert.IsTrue(DateTime.Now - fileInfo[i].LastWriteTime < new TimeSpan(0, 1, 0));
+            }
+        }
+
+        [TestMethod]
+        public void CabExtractorExtract()
+        {
+            int txtSize = 40960;
+            CabInfo cabInfo = new CabInfo("test.cab");
+            CompressionTestUtil.GenerateRandomFile("test0.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("test1.txt", 1, txtSize);
+            cabInfo.PackFiles(null, new string[] { "test0.txt", "test1.txt" }, null);
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                using (Stream cabStream = File.OpenRead("test.cab"))
+                {
+                    using (Stream exStream = cabEngine.Unpack(cabStream, "test0.txt"))
+                    {
+                        string str = new StreamReader(exStream).ReadToEnd();
+                        string expected = new StreamReader("test0.txt").ReadToEnd();
+                        Assert.AreEqual<string>(expected, str);
+                    }
+                    cabStream.Seek(0, SeekOrigin.Begin);
+                    using (Stream exStream = cabEngine.Unpack(cabStream, "test1.txt"))
+                    {
+                        string str = new StreamReader(exStream).ReadToEnd();
+                        string expected = new StreamReader("test1.txt").ReadToEnd();
+                        Assert.AreEqual<string>(expected, str);
+                    }
+                }
+                using (Stream txtStream = File.OpenRead("test0.txt"))
+                {
+                    Exception caughtEx = null;
+                    try
+                    {
+                        cabEngine.Unpack(txtStream, "test0.txt");
+                    }
+                    catch (Exception ex) { caughtEx = ex; }
+                    Assert.IsInstanceOfType(caughtEx, typeof(CabException));
+                    Assert.AreEqual<int>(2, ((CabException) caughtEx).Error);
+                    Assert.AreEqual<int>(0, ((CabException) caughtEx).ErrorCode);
+                    Assert.AreEqual<string>("Cabinet file does not have the correct format.", caughtEx.Message);
+                }
+            }
+        }
+
+        [TestMethod]
+        public void CabBadUnpackStreamContexts()
+        {
+            int txtSize = 40960;
+            CabInfo cabInfo = new CabInfo("test2.cab");
+            CompressionTestUtil.GenerateRandomFile("cabtest-0.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("cabtest-1.txt", 1, txtSize);
+            cabInfo.PackFiles(null, new string[] { "cabtest-0.txt", "cabtest-1.txt" }, null);
+
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                CompressionTestUtil.TestBadUnpackStreamContexts(cabEngine, "test2.cab");
+            }
+        }
+
+        [TestMethod]
+        public void CabinetExtractUpdate()
+        {
+            int fileCount = 5, fileSize = 2048;
+            string dirA = String.Format("{0}-{1}-A", fileCount, fileSize);
+            if (Directory.Exists(dirA)) Directory.Delete(dirA, true);
+            Directory.CreateDirectory(dirA);
+            string dirB = String.Format("{0}-{1}-B", fileCount, fileSize);
+            if (Directory.Exists(dirB)) Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+
+            string[] files = new string[fileCount];
+            for (int iFile = 0; iFile < fileCount; iFile++)
+            {
+                files[iFile] = "€" + iFile + ".txt";
+                CompressionTestUtil.GenerateRandomFile(Path.Combine(dirA, files[iFile]), iFile, fileSize);
+            }
+
+            CabInfo cabInfo = new CabInfo("testupdate.cab");
+            cabInfo.Pack(dirA);
+            cabInfo.Unpack(dirB);
+
+            DateTime originalTime = File.GetLastWriteTime(Path.Combine(dirA, "€1.txt"));
+            DateTime pastTime = originalTime - new TimeSpan(0, 5, 0);
+            DateTime futureTime = originalTime + new TimeSpan(0, 5, 0);
+
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                string cabName = "testupdate.cab";
+                ArchiveFileStreamContext streamContext = new ArchiveFileStreamContext(cabName, dirB, null);
+                streamContext.ExtractOnlyNewerFiles = true;
+
+                Assert.AreEqual<bool>(true, streamContext.ExtractOnlyNewerFiles);
+                Assert.IsNotNull(streamContext.ArchiveFiles);
+                Assert.AreEqual<int>(1, streamContext.ArchiveFiles.Count);
+                Assert.AreEqual<string>(cabName, streamContext.ArchiveFiles[0]);
+                Assert.AreEqual<string>(dirB, streamContext.Directory);
+
+                File.SetLastWriteTime(Path.Combine(dirB, "€1.txt"), futureTime);
+                cabEngine.Unpack(streamContext, null);
+                Assert.IsTrue(File.GetLastWriteTime(Path.Combine(dirB, "€1.txt")) - originalTime > new TimeSpan(0, 4, 55));
+
+                File.SetLastWriteTime(Path.Combine(dirB, "€1.txt"), pastTime);
+                File.SetLastWriteTime(Path.Combine(dirB, "€2.txt"), pastTime);
+                File.SetAttributes(Path.Combine(dirB, "€2.txt"), FileAttributes.ReadOnly);
+                File.SetAttributes(Path.Combine(dirB, "€2.txt"), FileAttributes.Hidden);
+                File.SetAttributes(Path.Combine(dirB, "€2.txt"), FileAttributes.System);
+
+                cabEngine.Unpack(streamContext, null);
+                Assert.IsTrue((File.GetLastWriteTime(Path.Combine(dirB, "€1.txt")) - originalTime).Duration() < new TimeSpan(0, 0, 5));
+
+                // Just test the rest of the streamContext properties here.
+                IDictionary<string, string> testMap = new Dictionary<string, string>();
+                streamContext = new ArchiveFileStreamContext(cabName, dirB, testMap);
+                Assert.AreSame(testMap, streamContext.Files);
+
+                Assert.IsFalse(streamContext.EnableOffsetOpen);
+                streamContext.EnableOffsetOpen = true;
+                Assert.IsTrue(streamContext.EnableOffsetOpen);
+                streamContext = new ArchiveFileStreamContext(cabName, ".", testMap);
+                Assert.AreEqual<string>(".", streamContext.Directory);
+                string[] testArchiveFiles = new string[] { cabName };
+                streamContext = new ArchiveFileStreamContext(testArchiveFiles, ".", testMap);
+                Assert.AreSame(testArchiveFiles, streamContext.ArchiveFiles);
+            }
+        }
+
+        [TestMethod]
+        public void CabinetOffset()
+        {
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("test.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("base.txt", 1, 2 * txtSize + 4);
+
+            ArchiveFileStreamContext streamContext = new ArchiveFileStreamContext("base.txt", null, null);
+            streamContext.EnableOffsetOpen = true;
+
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                cabEngine.Pack(streamContext, new string[] { "test.txt" });
+            }
+
+            Assert.IsTrue(new FileInfo("base.txt").Length > 2 * txtSize + 4);
+
+            string saveText;
+            using (Stream txtStream = File.OpenRead("test.txt"))
+            {
+                saveText = new StreamReader(txtStream).ReadToEnd();
+            }
+            File.Delete("test.txt");
+
+            using (CabEngine cex = new CabEngine())
+            {
+                cex.Unpack(streamContext, null);
+            }
+            string testText;
+            using (Stream txtStream = File.OpenRead("test.txt"))
+            {
+                testText = new StreamReader(txtStream).ReadToEnd();
+            }
+            Assert.AreEqual<string>(saveText, testText);
+        }
+
+        [TestMethod]
+        public void CabinetUtfPaths()
+        {
+            string[] files = new string[]
+            {
+                "어그리먼트送信ポート1ßà_Agreement.txt",
+                "콘토소ßà_MyProfile.txt",
+                "파트너1ßà_PartnerProfile.txt",
+            };
+
+            string dirA = "utf8-A";
+            if (Directory.Exists(dirA)) Directory.Delete(dirA, true);
+            Directory.CreateDirectory(dirA);
+            string dirB = "utf8-B";
+            if (Directory.Exists(dirB)) Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+
+            int txtSize = 1024;
+            CompressionTestUtil.GenerateRandomFile(Path.Combine(dirA, files[0]), 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile(Path.Combine(dirA, files[1]), 1, txtSize);
+            CompressionTestUtil.GenerateRandomFile(Path.Combine(dirA, files[2]), 2, txtSize);
+
+            ArchiveFileStreamContext streamContextA = new ArchiveFileStreamContext("utf8.cab", dirA, null);
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                cabEngine.Pack(streamContextA, files);
+            }
+
+            ArchiveFileStreamContext streamContextB = new ArchiveFileStreamContext("utf8.cab", dirB, null);
+            using (CabEngine cex = new CabEngine())
+            {
+                cex.Unpack(streamContextB, null);
+            }
+
+            bool directoryMatch = CompressionTestUtil.CompareDirectories(dirA, dirB);
+            Assert.IsTrue(directoryMatch,
+                "Testing whether cabinet output directory matches input directory.");
+        }
+
+        [TestMethod]
+        //[Ignore] // Requires clean environment.
+        public void CabInfoProperties()
+        {
+            Exception caughtEx;
+            CabInfo cabInfo = new CabInfo("test.cab");
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("test00.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("test01.txt", 1, txtSize);
+            cabInfo.PackFiles(null, new string[] { "test00.txt", "test01.txt" }, null);
+
+            Assert.AreEqual<string>(new FileInfo("test.cab").Directory.FullName, cabInfo.Directory.FullName, "CabInfo.FullName");
+            Assert.AreEqual<string>(new FileInfo("test.cab").DirectoryName, cabInfo.DirectoryName, "CabInfo.DirectoryName");
+            Assert.AreEqual<long>(new FileInfo("test.cab").Length, cabInfo.Length, "CabInfo.Length");
+            Assert.AreEqual<string>("test.cab", cabInfo.Name, "CabInfo.Name");
+            Assert.AreEqual<string>(new FileInfo("test.cab").FullName, cabInfo.ToString(), "CabInfo.ToString()");
+            cabInfo.CopyTo("test3.cab");
+            caughtEx = null;
+            try
+            {
+                cabInfo.CopyTo("test3.cab");
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(IOException), "CabInfo.CopyTo() caught exception: " + caughtEx);
+            cabInfo.CopyTo("test3.cab", true);
+            cabInfo.MoveTo("test4.cab");
+            Assert.AreEqual<string>("test4.cab", cabInfo.Name);
+            Assert.IsTrue(cabInfo.Exists, "CabInfo.Exists()");
+            Assert.IsTrue(cabInfo.IsValid(), "CabInfo.IsValid");
+            cabInfo.Delete();
+            Assert.IsFalse(cabInfo.Exists, "!CabInfo.Exists()");
+        }
+
+        [TestMethod]
+        //[Ignore] // Requires clean environment.
+        public void CabInfoNullParams()
+        {
+            int fileCount = 10, fileSize = 1024;
+            string dirA = String.Format("{0}-{1}-A", fileCount, fileSize);
+            if (Directory.Exists(dirA)) Directory.Delete(dirA, true);
+            Directory.CreateDirectory(dirA);
+            string dirB = String.Format("{0}-{1}-B", fileCount, fileSize);
+            if (Directory.Exists(dirB)) Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+
+            string[] files = new string[fileCount];
+            for (int iFile = 0; iFile < fileCount; iFile++)
+            {
+                files[iFile] = "cabinfo-" + iFile + ".txt";
+                CompressionTestUtil.GenerateRandomFile(Path.Combine(dirA, files[iFile]), iFile, fileSize);
+            }
+
+            CabInfo cabInfo = new CabInfo("testnull.cab");
+
+            CompressionTestUtil.TestArchiveInfoNullParams(cabInfo, dirA, dirB, files);
+        }
+
+        [TestMethod]
+        public void CabInfoGetFiles()
+        {
+            IList<CabFileInfo> fileInfo;
+            CabInfo cabInfo = new CabInfo("test.cab");
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("testinfo0.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("testinfo1.txt", 1, txtSize);
+            cabInfo.PackFiles(null, new string[] { "testinfo0.txt", "testinfo1.txt" }, null);
+
+            fileInfo = cabInfo.GetFiles();
+            Assert.IsNotNull(fileInfo);
+            Assert.AreEqual<int>(2, fileInfo.Count);
+            Assert.AreEqual<string>("testinfo0.txt", fileInfo[0].Name);
+            Assert.AreEqual<string>("testinfo1.txt", fileInfo[1].Name);
+
+            fileInfo = cabInfo.GetFiles("*.txt");
+            Assert.IsNotNull(fileInfo);
+            Assert.AreEqual<int>(2, fileInfo.Count);
+            Assert.AreEqual<string>("testinfo0.txt", fileInfo[0].Name);
+            Assert.AreEqual<string>("testinfo1.txt", fileInfo[1].Name);
+
+            fileInfo = cabInfo.GetFiles("testinfo1.txt");
+            Assert.IsNotNull(fileInfo);
+            Assert.AreEqual<int>(1, fileInfo.Count);
+            Assert.AreEqual<string>("testinfo1.txt", fileInfo[0].Name);
+        }
+
+        [TestMethod]
+        public void CabInfoCompressExtract()
+        {
+            int fileCount = 10, fileSize = 1024;
+            string dirA = String.Format("{0}-{1}-A", fileCount, fileSize);
+            if (Directory.Exists(dirA)) Directory.Delete(dirA, true);
+            Directory.CreateDirectory(dirA);
+            Directory.CreateDirectory(Path.Combine(dirA, "sub"));
+            string dirB = String.Format("{0}-{1}-B", fileCount, fileSize);
+            if (Directory.Exists(dirB)) Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+
+            string[] files = new string[fileCount];
+            for (int iFile = 0; iFile < fileCount; iFile++)
+            {
+                files[iFile] = "€" + iFile + ".txt";
+                CompressionTestUtil.GenerateRandomFile(Path.Combine(dirA, files[iFile]), iFile, fileSize);
+            }
+            CompressionTestUtil.GenerateRandomFile(Path.Combine(Path.Combine(dirA, "sub"), "€-.txt"), fileCount + 1, fileSize);
+
+            CabInfo cabInfo = new CabInfo("test.cab");
+            cabInfo.Pack(dirA);
+            cabInfo.Unpack(dirB);
+            bool directoryMatch = CompressionTestUtil.CompareDirectories(dirA, dirB);
+            Assert.IsFalse(directoryMatch,
+                "Testing whether cabinet output directory matches input directory.");
+            Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+            cabInfo.Pack(dirA, true, CompressionLevel.Normal, null);
+            cabInfo.Unpack(dirB);
+            directoryMatch = CompressionTestUtil.CompareDirectories(dirA, dirB);
+            Assert.IsTrue(directoryMatch,
+                "Testing whether cabinet output directory matches input directory.");
+            Directory.Delete(dirB, true);
+            Directory.Delete(Path.Combine(dirA, "sub"), true);
+            Directory.CreateDirectory(dirB);
+            cabInfo.Delete();
+
+            cabInfo.PackFiles(dirA, files, null);
+            cabInfo.UnpackFiles(files, dirB, null);
+            directoryMatch = CompressionTestUtil.CompareDirectories(dirA, dirB);
+            Assert.IsTrue(directoryMatch,
+                "Testing whether cabinet output directory matches input directory.");
+            Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+            cabInfo.Delete();
+
+            IDictionary<string, string> testMap = new Dictionary<string, string>(files.Length);
+            for (int iFile = 0; iFile < fileCount; iFile++)
+            {
+                testMap[files[iFile] + ".key"] = files[iFile];
+            }
+            cabInfo.PackFileSet(dirA, testMap);
+            cabInfo.UnpackFileSet(testMap, dirB);
+            directoryMatch = CompressionTestUtil.CompareDirectories(dirA, dirB);
+            Assert.IsTrue(directoryMatch,
+                "Testing whether cabinet output directory matches input directory.");
+            Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+
+            testMap.Remove(files[1] + ".key");
+            cabInfo.UnpackFileSet(testMap, dirB);
+            directoryMatch = CompressionTestUtil.CompareDirectories(dirA, dirB);
+            Assert.IsFalse(directoryMatch,
+                "Testing whether cabinet output directory matches input directory.");
+            Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+            cabInfo.Delete();
+
+            cabInfo.PackFiles(dirA, files, null);
+            cabInfo.UnpackFile("€2.txt", Path.Combine(dirB, "test.txt"));
+            Assert.IsTrue(File.Exists(Path.Combine(dirB, "test.txt")));
+            Assert.AreEqual<int>(1, Directory.GetFiles(dirB).Length);
+        }
+
+        [TestMethod]
+        //[Ignore] // Requires clean environment.
+        public void CabFileInfoProperties()
+        {
+            CabInfo cabInfo = new CabInfo("test.cab");
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("test00.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("test01.txt", 1, txtSize);
+            File.SetAttributes("test01.txt", FileAttributes.ReadOnly | FileAttributes.Archive);
+            DateTime testTime = File.GetLastWriteTime("test01.txt");
+            cabInfo.PackFiles(null, new string[] { "test00.txt", "test01.txt" }, null);
+            File.SetAttributes("test01.txt", FileAttributes.Archive);
+
+            CabFileInfo cfi = new CabFileInfo(cabInfo, "test01.txt");
+            Assert.AreEqual(cabInfo.FullName, cfi.CabinetName);
+            Assert.AreEqual<int>(0, ((CabFileInfo) cfi).CabinetFolderNumber);
+            Assert.AreEqual<string>(Path.Combine(cabInfo.FullName, "test01.txt"), cfi.FullName);
+            cfi = new CabFileInfo(cabInfo, "test01.txt");
+            Assert.IsTrue(cfi.Exists);
+            cfi = new CabFileInfo(cabInfo, "test01.txt");
+            Assert.AreEqual<long>(txtSize, cfi.Length);
+            cfi = new CabFileInfo(cabInfo, "test00.txt");
+            Assert.AreEqual<FileAttributes>(FileAttributes.Archive, cfi.Attributes);
+            cfi = new CabFileInfo(cabInfo, "test01.txt");
+            Assert.AreEqual<FileAttributes>(FileAttributes.ReadOnly | FileAttributes.Archive, cfi.Attributes);
+            cfi = new CabFileInfo(cabInfo, "test01.txt");
+            Assert.IsTrue((testTime - cfi.LastWriteTime).Duration() < new TimeSpan(0, 0, 5));
+            Assert.AreEqual<string>(Path.Combine(cabInfo.FullName, "test01.txt"), cfi.ToString());
+            cfi.CopyTo("testcopy.txt");
+            Assert.IsTrue(File.Exists("testCopy.txt"));
+            Assert.AreEqual<long>(cfi.Length, new FileInfo("testCopy.txt").Length);
+
+            Exception caughtEx = null;
+            try
+            {
+                cfi.CopyTo("testcopy.txt", false);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(IOException));
+        }
+
+        [TestMethod]
+        public void CabFileInfoOpenText()
+        {
+            CabInfo cabInfo = new CabInfo("test.cab");
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("test00.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("test01.txt", 1, txtSize);
+
+            string expectedText = File.ReadAllText("test01.txt");
+            
+            cabInfo.PackFiles(null, new string[] { "test00.txt", "test01.txt" }, null);
+
+            CabFileInfo cfi = new CabFileInfo(cabInfo, "test01.txt");
+            using (StreamReader cabFileReader = cfi.OpenText())
+            {
+                string text = cabFileReader.ReadToEnd();
+                Assert.AreEqual(expectedText, text);
+
+                // Check the assumption that the cab can't be deleted while a stream is open.
+                Exception caughtEx = null;
+                try
+                {
+                    File.Delete(cabInfo.FullName);
+                }
+                catch (Exception ex)
+                {
+                    caughtEx = ex;
+                }
+
+                Assert.IsInstanceOfType(caughtEx, typeof(IOException));
+            }
+
+            // Ensure all streams are closed after disposing of the StreamReader returned by OpenText.
+            File.Delete(cabInfo.FullName);
+        }
+
+        [TestMethod]
+        public void CabFileInfoNullParams()
+        {
+            Exception caughtEx;
+            CabInfo cabInfo = new CabInfo("test.cab");
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("test00.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("test01.txt", 1, txtSize);
+            cabInfo.PackFiles(null, new string[] { "test00.txt", "test01.txt" }, null);
+            CabFileInfo cfi = new CabFileInfo(cabInfo, "test01.txt");
+
+            caughtEx = null;
+            try
+            {
+                new CabFileInfo(null, "test00.txt");
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException));
+            caughtEx = null;
+            try
+            {
+                new CabFileInfo(cabInfo, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException));
+            caughtEx = null;
+            try
+            {
+                cfi.CopyTo(null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException));
+        }
+
+        [TestMethod]
+        public void CabInfoSerialization()
+        {
+            CabInfo cabInfo = new CabInfo("testser.cab");
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("testser00.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("testser01.txt", 1, txtSize);
+            cabInfo.PackFiles(null, new string[] { "testser00.txt", "testser01.txt" }, null);
+            ArchiveFileInfo cfi = cabInfo.GetFiles()[1];
+
+            MemoryStream memStream = new MemoryStream();
+
+            BinaryFormatter formatter = new BinaryFormatter();
+
+            memStream.Seek(0, SeekOrigin.Begin);
+            formatter.Serialize(memStream, cabInfo);
+            memStream.Seek(0, SeekOrigin.Begin);
+            CabInfo cabInfo2 = (CabInfo) formatter.Deserialize(memStream);
+            Assert.AreEqual<string>(cabInfo.FullName, cabInfo2.FullName);
+
+            memStream.Seek(0, SeekOrigin.Begin);
+            formatter.Serialize(memStream, cfi);
+            memStream.Seek(0, SeekOrigin.Begin);
+            CabFileInfo cfi2 = (CabFileInfo) formatter.Deserialize(memStream);
+            Assert.AreEqual<string>(cfi.FullName, cfi2.FullName);
+            Assert.AreEqual<long>(cfi.Length, cfi2.Length);
+
+            CabException cabEx = new CabException();
+            memStream.Seek(0, SeekOrigin.Begin);
+            formatter.Serialize(memStream, cabEx);
+            memStream.Seek(0, SeekOrigin.Begin);
+            formatter.Deserialize(memStream);
+
+            cabEx = new CabException("Test exception.", null);
+            Assert.AreEqual<string>("Test exception.", cabEx.Message);
+        }
+
+        [TestMethod]
+        public void CabFileStreamContextNullParams()
+        {
+            ArchiveFileStreamContext streamContext = null;
+            Exception caughtEx = null;
+            try
+            {
+                streamContext = new ArchiveFileStreamContext(null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Passing null to constructor.");
+            caughtEx = null;
+            try
+            {
+                streamContext = new ArchiveFileStreamContext(new string[] { }, "testDir", new Dictionary<string, string>());
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Passing 0-length array to constructor.");
+            caughtEx = null;
+            try
+            {
+                streamContext = new ArchiveFileStreamContext(new string[] { "test.cab" }, null, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx);
+        }
+
+        [TestMethod]
+        public void CabinetTruncateOnCreate()
+        {
+            CabInfo cabInfo = new CabInfo("testtruncate.cab");
+            int txtSize = 20240;
+            CompressionTestUtil.GenerateRandomFile("testtruncate0.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("testtruncate1.txt", 1, txtSize);
+            cabInfo.PackFiles(null, new string[] { "testtruncate0.txt", "testtruncate1.txt" }, null);
+
+            long size1 = cabInfo.Length;
+
+            txtSize /= 5;
+            CompressionTestUtil.GenerateRandomFile("testtruncate2.txt", 2, txtSize);
+            CompressionTestUtil.GenerateRandomFile("testtruncate3.txt", 3, txtSize);
+            cabInfo.PackFiles(null, new string[] { "testtruncate2.txt", "testtruncate3.txt" }, null);
+
+            // The newly created cab file should be smaller than before.
+            Assert.AreNotEqual<long>(size1, cabInfo.Length, "Checking that cabinet file got truncated when creating a smaller cab in-place.");
+        }
+
+        [TestMethod]
+        public void CabTruncatedArchive()
+        {
+            CabInfo cabInfo = new CabInfo("test-t.cab");
+            CompressionTestUtil.GenerateRandomFile("cabtest-0.txt", 0, 5);
+            CompressionTestUtil.GenerateRandomFile("cabtest-1.txt", 1, 5);
+            cabInfo.PackFiles(null, new string[] { "cabtest-0.txt", "cabtest-1.txt" }, null);
+
+            CompressionTestUtil.TestTruncatedArchive(cabInfo, typeof(CabException));
+        }
+        private const string TEST_FILENAME_PREFIX = "\x20AC";
+
+        private IList<ArchiveFileInfo> RunCabinetPackUnpack(int fileCount, long fileSize)
+        {
+            return RunCabinetPackUnpack(fileCount, fileSize, 0, 0);
+        }
+        private IList<ArchiveFileInfo> RunCabinetPackUnpack(int fileCount, long fileSize,
+            long maxFolderSize, long maxArchiveSize)
+        {
+            return this.RunCabinetPackUnpack(fileCount, fileSize, maxFolderSize, maxArchiveSize, CompressionLevel.Normal);
+        }
+        private IList<ArchiveFileInfo> RunCabinetPackUnpack(int fileCount, long fileSize,
+            long maxFolderSize, long maxArchiveSize, CompressionLevel compLevel)
+        {
+            Console.WriteLine("Creating cabinet with {0} files of size {1}",
+                fileCount, fileSize);
+            Console.WriteLine("MaxFolderSize={0}, MaxArchiveSize={1}, CompressionLevel={2}",
+                maxFolderSize, maxArchiveSize, compLevel);
+
+            string dirA = String.Format("{0}-{1}-A", fileCount, fileSize);
+            if (Directory.Exists(dirA)) Directory.Delete(dirA, true);
+            Directory.CreateDirectory(dirA);
+            string dirB = String.Format("{0}-{1}-B", fileCount, fileSize);
+            if (Directory.Exists(dirB)) Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+
+            string[] files = new string[fileCount];
+            for (int iFile = 0; iFile < fileCount; iFile++)
+            {
+                files[iFile] = TEST_FILENAME_PREFIX + iFile + ".txt";
+                CompressionTestUtil.GenerateRandomFile(Path.Combine(dirA, files[iFile]), iFile, fileSize);
+            }
+
+            string[] archiveNames = new string[100];
+            for (int i = 0; i < archiveNames.Length; i++)
+            {
+                archiveNames[i] = String.Format("{0}-{1}{2}{3}.cab", fileCount, fileSize,
+                    (i == 0 ? "" : "-"), (i == 0 ? "" : i.ToString()));
+            }
+
+            string progressTextFile = String.Format("progress_{0}-{1}.txt", fileCount, fileSize);
+            CompressionTestUtil testUtil = new CompressionTestUtil(progressTextFile);
+
+            IList<ArchiveFileInfo> fileInfo;
+            using (CabEngine cabEngine = new CabEngine())
+            {
+                cabEngine.CompressionLevel = compLevel;
+
+                File.AppendAllText(progressTextFile,
+                    "\r\n\r\n====================================================\r\nCREATE\r\n\r\n");
+                cabEngine.Progress += testUtil.PrintArchiveProgress;
+
+                OptionStreamContext streamContext = new OptionStreamContext(archiveNames, dirA, null);
+                if (maxFolderSize == 1)
+                {
+                    streamContext.OptionHandler =
+                        delegate(string optionName, object[] parameters)
+                        {
+                            if (optionName == "nextFolder") return true;
+                            return null;
+                        };
+                }
+                else if (maxFolderSize > 1)
+                {
+                    streamContext.OptionHandler =
+                        delegate(string optionName, object[] parameters)
+                        {
+                            if (optionName == "maxFolderSize") return maxFolderSize;
+                            return null;
+                        };
+                }
+                cabEngine.Pack(streamContext, files, maxArchiveSize);
+
+                IList<string> createdArchiveNames = new List<string>(archiveNames.Length);
+                for (int i = 0; i < archiveNames.Length; i++)
+                {
+                    if (File.Exists(archiveNames[i]))
+                    {
+                        createdArchiveNames.Add(archiveNames[i]);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+
+                Console.WriteLine("Listing cabinet with {0} files of size {1}",
+                    fileCount, fileSize);
+                File.AppendAllText(progressTextFile, "\r\n\r\nLIST\r\n\r\n");
+                fileInfo = cabEngine.GetFileInfo(
+                    new ArchiveFileStreamContext(createdArchiveNames, null, null), null);
+
+                Assert.AreEqual<int>(fileCount, fileInfo.Count);
+                if (fileCount > 0)
+                {
+                    int folders = ((CabFileInfo) fileInfo[fileInfo.Count - 1]).CabinetFolderNumber + 1;
+                    if (maxFolderSize == 1)
+                    {
+                        Assert.AreEqual<int>(fileCount, folders);
+                    }
+                }
+
+                Console.WriteLine("Extracting cabinet with {0} files of size {1}",
+                    fileCount, fileSize);
+                File.AppendAllText(progressTextFile, "\r\n\r\nEXTRACT\r\n\r\n");
+                cabEngine.Unpack(new ArchiveFileStreamContext(createdArchiveNames, dirB, null), null);
+            }
+
+            bool directoryMatch = CompressionTestUtil.CompareDirectories(dirA, dirB);
+            Assert.IsTrue(directoryMatch,
+                "Testing whether cabinet output directory matches input directory.");
+
+            return fileInfo;
+        }
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
new file mode 100644
index 00000000..4c269d55
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.Compression.Cab/WixToolsetTests.Dtf.Compression.Cab.csproj
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- 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. -->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectGuid>{4544158C-2D63-4146-85FF-62169280144E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>WixToolsetTests.Dtf.Cab</RootNamespace>
+    <AssemblyName>WixToolsetTests.Dtf.Cab</AssemblyName>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <CreateDocumentation>false</CreateDocumentation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="CabTest.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
+    <ProjectReference Include="..\WixToolset.Dtf.Compression.Cab\WixToolset.Dtf.Compression.Cab.csproj" />
+    <ProjectReference Include="..\WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
new file mode 100644
index 00000000..c65563b6
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/WixToolsetTests.Dtf.Compression.Zip.csproj
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- 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. -->
+
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{328799BB-7B03-4B28-8180-4132211FD07D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>WixToolsetTests.Dtf</RootNamespace>
+    <AssemblyName>WixToolsetTests.Dtf.Zip</AssemblyName>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <CreateDocumentation>false</CreateDocumentation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="ZipTest.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
+    <ProjectReference Include="..\WixToolset.Dtf.Compression.Zip\WixToolset.Dtf.Compression.Zip.csproj" />
+    <ProjectReference Include="..\WixToolsetTests.Dtf.Compression\WixToolsetTests.Dtf.Compression.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression.Zip/ZipTest.cs b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/ZipTest.cs
new file mode 100644
index 00000000..b264ad5b
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.Compression.Zip/ZipTest.cs
@@ -0,0 +1,518 @@
+// 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.Dtf.Test
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Collections.Generic;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixToolset.Dtf.Compression;
+    using WixToolset.Dtf.Compression.Zip;
+
+    [TestClass]
+    public class ZipTest
+    {
+        public ZipTest()
+        {
+        }
+
+        [TestInitialize]
+        public void Initialize()
+        {
+        }
+
+        [TestCleanup]
+        public void Cleanup()
+        {
+        }
+
+        [TestMethod]
+        public void ZipFileCounts()
+        {
+            this.RunZipPackUnpack(0, 10, 0);
+            this.RunZipPackUnpack(0, 100000, 0);
+            this.RunZipPackUnpack(1, 10, 0);
+            this.RunZipPackUnpack(100, 10, 0);
+        }
+
+        [TestMethod]
+        [Ignore] // Takes too long to run regularly.
+        public void ZipExtremeFileCounts()
+        {
+            this.RunZipPackUnpack(66000, 10, 0);
+        }
+
+        [TestMethod]
+        public void ZipFileSizes()
+        {
+            this.RunZipPackUnpack(1, 0, 0);
+            for (int n = 1; n <= 33; n++)
+            {
+                this.RunZipPackUnpack(1, n, 0);
+            }
+            this.RunZipPackUnpack(1, 100 * 1024, 0);
+            this.RunZipPackUnpack(1, 10 * 1024 * 1024, 0);
+        }
+
+        [Timeout(36000000), TestMethod]
+        [Ignore] // Takes too long to run regularly.
+        public void ZipExtremeFileSizes()
+        {
+            //this.RunZipPackUnpack(10, 512L * 1024 * 1024, 0); // 5GB
+            this.RunZipPackUnpack(1, 5L * 1024 * 1024 * 1024, 0, CompressionLevel.None); // 5GB
+        }
+
+        [TestMethod]
+        public void ZipArchiveCounts()
+        {
+            IList<ArchiveFileInfo> fileInfo;
+            fileInfo = this.RunZipPackUnpack(10, 100 * 1024, 400 * 1024, CompressionLevel.None);
+            Assert.AreEqual<int>(2, fileInfo[fileInfo.Count - 1].ArchiveNumber,
+                "Testing whether archive spans the correct # of zip files.");
+
+            fileInfo = this.RunZipPackUnpack(2, 90 * 1024, 40 * 1024, CompressionLevel.None);
+            Assert.AreEqual<int>(2, fileInfo[fileInfo.Count - 1].ArchiveNumber,
+                "Testing whether archive spans the correct # of zip files.");
+        }
+
+        [TestMethod]
+        public void ZipProgress()
+        {
+            CompressionTestUtil.ExpectedProgress = new List<int[]>(new int[][] {
+                //    StatusType,  CurFile,TotalFiles,CurFolder,CurArchive,TotalArchives
+                new int[] { (int) ArchiveProgressType.StartArchive,    0, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   0, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  0, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   1, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  1, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   2, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  2, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   3, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  3, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   4, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  4, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   5, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  5, 15, 0, 0, 1 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   6, 15, 0, 0, 1 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,   6, 15, 0, 0, 1 },
+                new int[] { (int) ArchiveProgressType.StartArchive,    6, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  6, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   7, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  7, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   8, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  8, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   9, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  9, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  10, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 10, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  11, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 11, 15, 0, 1, 2 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  12, 15, 0, 1, 2 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,  12, 15, 0, 1, 2 },
+                new int[] { (int) ArchiveProgressType.StartArchive,   12, 15, 0, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 12, 15, 0, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  13, 15, 0, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 13, 15, 0, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  14, 15, 0, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 14, 15, 0, 2, 3 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,  14, 15, 0, 2, 3 },
+                //    StatusType,  CurFile,TotalFiles,CurFolder,CurArchive,TotalArchives
+                new int[] { (int) ArchiveProgressType.StartArchive,    0, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   0, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  0, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   1, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  1, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   2, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  2, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   3, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  3, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   4, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  4, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   5, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  5, 15, 0, 0, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   6, 15, 0, 0, 3 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,   6, 15, 0, 0, 3 },
+                new int[] { (int) ArchiveProgressType.StartArchive,    6, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  6, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   7, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  7, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   8, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  8, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,   9, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile,  9, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  10, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 10, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  11, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 11, 15, 0, 1, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  12, 15, 0, 1, 3 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,  12, 15, 0, 1, 3 },
+                new int[] { (int) ArchiveProgressType.StartArchive,   12, 15, 0, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 12, 15, 0, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  13, 15, 0, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 13, 15, 0, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.StartFile,  14, 15, 0, 2, 3 },
+                new int[] { (int)     ArchiveProgressType.FinishFile, 14, 15, 0, 2, 3 },
+                new int[] { (int) ArchiveProgressType.FinishArchive,  14, 15, 0, 2, 3 },
+            });
+            CompressionTestUtil.ExpectedProgress = null;
+
+            try
+            {
+                this.RunZipPackUnpack(15, 20 * 1024, 130 * 1024, CompressionLevel.None);
+            }
+            finally
+            {
+                CompressionTestUtil.ExpectedProgress = null;
+            }
+        }
+
+        [TestMethod]
+        //[Ignore] // Requires clean environment.
+        public void ZipArchiveSizes()
+        {
+            Console.WriteLine("Testing various values for the maxArchiveSize parameter.");
+            this.RunZipPackUnpack(5, 1024, Int64.MinValue);
+            this.RunZipPackUnpack(5, 1024, -1);
+            this.RunZipPackUnpack(2, 10, 0);
+
+            this.RunZipPackUnpack(1, 10, 1);
+            this.RunZipPackUnpack(2, 10, 2);
+            this.RunZipPackUnpack(2, 10, 3);
+            this.RunZipPackUnpack(2, 10, 4);
+            this.RunZipPackUnpack(2, 10, 5);
+            this.RunZipPackUnpack(2, 10, 6);
+            this.RunZipPackUnpack(2, 10, 7);
+            this.RunZipPackUnpack(5, 10, 8);
+            this.RunZipPackUnpack(5, 10, 9);
+            this.RunZipPackUnpack(5, 10, 10);
+            this.RunZipPackUnpack(5, 10, 11);
+            this.RunZipPackUnpack(5, 10, 12);
+
+            this.RunZipPackUnpack(5, 101, 255);
+            this.RunZipPackUnpack(5, 102, 256);
+            this.RunZipPackUnpack(5, 103, 257);
+            this.RunZipPackUnpack(5, 24000, 32768);
+            this.RunZipPackUnpack(5, 1024, Int64.MaxValue);
+        }
+
+        [TestMethod]
+        public void ZipCompLevelParam()
+        {
+            Console.WriteLine("Testing various values for the compressionLevel parameter.");
+            this.RunZipPackUnpack(5, 1024, 0, CompressionLevel.None);
+            this.RunZipPackUnpack(5, 1024, 0, CompressionLevel.Min);
+            this.RunZipPackUnpack(5, 1024, 0, CompressionLevel.Normal);
+            this.RunZipPackUnpack(5, 1024, 0, CompressionLevel.Max);
+            this.RunZipPackUnpack(5, 1024, 0, (CompressionLevel) ((int) CompressionLevel.None - 1));
+            this.RunZipPackUnpack(5, 1024, 0, (CompressionLevel) ((int) CompressionLevel.Max + 1));
+            this.RunZipPackUnpack(5, 1024, 0, (CompressionLevel) Int32.MinValue);
+            this.RunZipPackUnpack(5, 1024, 0, (CompressionLevel) Int32.MaxValue);
+        }
+
+        [TestMethod]
+        public void ZipInfoGetFiles()
+        {
+            IList<ZipFileInfo> fileInfos;
+            ZipInfo zipInfo = new ZipInfo("testgetfiles.zip");
+
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("testinfo0.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("testinfo1.txt", 1, txtSize);
+            CompressionTestUtil.GenerateRandomFile("testinfo2.ini", 2, txtSize);
+            zipInfo.PackFiles(null, new string[] { "testinfo0.txt", "testinfo1.txt", "testinfo2.ini" }, null);
+
+            fileInfos = zipInfo.GetFiles();
+            Assert.IsNotNull(fileInfos);
+            Assert.AreEqual<int>(3, fileInfos.Count);
+            Assert.AreEqual<string>("testinfo0.txt", fileInfos[0].Name);
+            Assert.AreEqual<string>("testinfo1.txt", fileInfos[1].Name);
+            Assert.AreEqual<string>("testinfo2.ini", fileInfos[2].Name);
+
+            fileInfos = zipInfo.GetFiles("*.txt");
+            Assert.IsNotNull(fileInfos);
+            Assert.AreEqual<int>(2, fileInfos.Count);
+            Assert.AreEqual<string>("testinfo0.txt", fileInfos[0].Name);
+            Assert.AreEqual<string>("testinfo1.txt", fileInfos[1].Name);
+
+            fileInfos = zipInfo.GetFiles("testinfo1.txt");
+            Assert.IsNotNull(fileInfos);
+            Assert.AreEqual<int>(1, fileInfos.Count);
+            Assert.AreEqual<string>("testinfo1.txt", fileInfos[0].Name);
+            Assert.IsTrue(DateTime.Now - fileInfos[0].LastWriteTime < TimeSpan.FromMinutes(1),
+                "Checking ZipFileInfo.LastWriteTime is current.");
+        }
+
+        [TestMethod]
+        //[Ignore] // Requires clean environment.
+        public void ZipInfoNullParams()
+        {
+            int fileCount = 10, fileSize = 1024;
+            string dirA = String.Format("{0}-{1}-A", fileCount, fileSize);
+            if (Directory.Exists(dirA)) Directory.Delete(dirA, true);
+            Directory.CreateDirectory(dirA);
+            string dirB = String.Format("{0}-{1}-B", fileCount, fileSize);
+            if (Directory.Exists(dirB)) Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+
+            string[] files = new string[fileCount];
+            for (int iFile = 0; iFile < fileCount; iFile++)
+            {
+                files[iFile] = "zipinfo-" + iFile + ".txt";
+                CompressionTestUtil.GenerateRandomFile(Path.Combine(dirA, files[iFile]), iFile, fileSize);
+            }
+
+            ZipInfo zipInfo = new ZipInfo("testnull.zip");
+
+            CompressionTestUtil.TestArchiveInfoNullParams(zipInfo, dirA, dirB, files);
+        }
+
+        [TestMethod]
+        public void ZipFileInfoNullParams()
+        {
+            Exception caughtEx;
+            ZipInfo zipInfo = new ZipInfo("test.zip");
+            int txtSize = 10240;
+            CompressionTestUtil.GenerateRandomFile("test00.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("test01.txt", 1, txtSize);
+            zipInfo.PackFiles(null, new string[] { "test00.txt", "test01.txt" }, null);
+            ZipFileInfo zfi = new ZipFileInfo(zipInfo, "test01.txt");
+
+            caughtEx = null;
+            try
+            {
+                new ZipFileInfo(null, "test00.txt");
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException));
+            caughtEx = null;
+            try
+            {
+                new ZipFileInfo(zipInfo, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException));
+            caughtEx = null;
+            try
+            {
+                zfi.CopyTo(null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException));
+        }
+
+        [TestMethod]
+        public void ZipEngineNullParams()
+        {
+            string[] testFiles = new string[] { "test.txt" };
+            ArchiveFileStreamContext streamContext = new ArchiveFileStreamContext("test.zip", null, null);
+
+            using (ZipEngine zipEngine = new ZipEngine())
+            {
+                zipEngine.CompressionLevel = CompressionLevel.None;
+
+                CompressionTestUtil.TestCompressionEngineNullParams(zipEngine, streamContext, testFiles);
+            }
+        }
+
+        [TestMethod]
+        public void ZipBadPackStreamContexts()
+        {
+            string[] testFiles = new string[] { "test.txt" };
+            CompressionTestUtil.GenerateRandomFile(testFiles[0], 0, 20000);
+
+            using (ZipEngine zipEngine = new ZipEngine())
+            {
+                zipEngine.CompressionLevel = CompressionLevel.None;
+
+                CompressionTestUtil.TestBadPackStreamContexts(zipEngine, "test.zip", testFiles);
+            }
+        }
+
+        [TestMethod]
+        public void ZipBadUnpackStreamContexts()
+        {
+            int txtSize = 40960;
+            ZipInfo zipInfo = new ZipInfo("test2.zip");
+            CompressionTestUtil.GenerateRandomFile("ziptest-0.txt", 0, txtSize);
+            CompressionTestUtil.GenerateRandomFile("ziptest-1.txt", 1, txtSize);
+            zipInfo.PackFiles(null, new string[] { "ziptest-0.txt", "ziptest-1.txt" }, null);
+
+            using (ZipEngine zipEngine = new ZipEngine())
+            {
+                CompressionTestUtil.TestBadUnpackStreamContexts(zipEngine, "test2.zip");
+            }
+        }
+
+        [TestMethod]
+        [Ignore] // Failed on build server, need to investigate.
+        public void ZipTruncatedArchive()
+        {
+            ZipInfo zipInfo = new ZipInfo("test-t.zip");
+            CompressionTestUtil.GenerateRandomFile("ziptest-0.txt", 0, 5);
+            CompressionTestUtil.GenerateRandomFile("ziptest-1.txt", 1, 5);
+            zipInfo.PackFiles(null, new string[] { "ziptest-0.txt", "ziptest-1.txt" }, null);
+
+            CompressionTestUtil.TestTruncatedArchive(zipInfo, typeof(ZipException));
+        }
+
+        /*
+        [TestMethod]
+        public void ZipUnpack()
+        {
+            IList<ZipFileInfo> fileInfos;
+            foreach (FileInfo zipFile in new DirectoryInfo("D:\\temp").GetFiles("*.zip"))
+            {
+                Console.WriteLine("=====================================================");
+                Console.WriteLine(zipFile.FullName);
+                Console.WriteLine("=====================================================");
+                ZipInfo zipTest = new ZipInfo(zipFile.FullName);
+                fileInfos = zipTest.GetFiles();
+                Assert.AreNotEqual<int>(0, fileInfos.Count);
+                foreach (ArchiveFileInfo file in fileInfos)
+                {
+                    Console.WriteLine("{0}\t{1}\t{2}", Path.Combine(file.Path, file.Name), file.Length, file.LastWriteTime);
+                }
+
+                Directory.CreateDirectory(Path.GetFileNameWithoutExtension(zipFile.Name));
+                zipTest.Unpack(Path.GetFileNameWithoutExtension(zipFile.Name));
+            }
+        }
+        */
+
+        /*
+        [TestMethod]
+        public void ZipUnpackSelfExtractor()
+        {
+            ZipInfo zipTest = new ZipInfo(@"C:\temp\testzip.exe");
+            IList<ZipFileInfo> fileInfos = zipTest.GetFiles();
+            Assert.AreNotEqual<int>(0, fileInfos.Count);
+            foreach (ArchiveFileInfo file in fileInfos)
+            {
+                Console.WriteLine("{0}\t{1}\t{2}", Path.Combine(file.Path, file.Name), file.Length, file.LastWriteTime);
+            }
+
+            string extractDir = Path.GetFileNameWithoutExtension(zipTest.Name);
+            Directory.CreateDirectory(extractDir);
+            zipTest.Unpack(extractDir);
+        }
+        */
+
+        private const string TEST_FILENAME_PREFIX = "\x20AC";
+
+        private IList<ArchiveFileInfo> RunZipPackUnpack(int fileCount, long fileSize,
+            long maxArchiveSize)
+        {
+            return this.RunZipPackUnpack(fileCount, fileSize, maxArchiveSize, CompressionLevel.Normal);
+        }
+
+        private IList<ArchiveFileInfo> RunZipPackUnpack(int fileCount, long fileSize,
+            long maxArchiveSize, CompressionLevel compLevel)
+        {
+            Console.WriteLine("Creating zip archive with {0} files of size {1}",
+                fileCount, fileSize);
+            Console.WriteLine("MaxArchiveSize={0}, CompressionLevel={1}", maxArchiveSize, compLevel);
+
+            string dirA = String.Format("{0}-{1}-A", fileCount, fileSize);
+            if (Directory.Exists(dirA)) Directory.Delete(dirA, true);
+            Directory.CreateDirectory(dirA);
+            string dirB = String.Format("{0}-{1}-B", fileCount, fileSize);
+            if (Directory.Exists(dirB)) Directory.Delete(dirB, true);
+            Directory.CreateDirectory(dirB);
+
+            string[] files = new string[fileCount];
+            for (int iFile = 0; iFile < fileCount; iFile++)
+            {
+                files[iFile] = TEST_FILENAME_PREFIX + iFile + ".txt";
+                CompressionTestUtil.GenerateRandomFile(Path.Combine(dirA, files[iFile]), iFile, fileSize);
+            }
+
+            string[] archiveNames = new string[1000];
+            for (int i = 0; i < archiveNames.Length; i++)
+            {
+                if (i < 100)
+                {
+                    archiveNames[i] = String.Format(
+                        (i == 0 ? "{0}-{1}.zip" : "{0}-{1}.z{2:d02}"),
+                        fileCount, fileSize, i);
+                }
+                else
+                {
+                    archiveNames[i] = String.Format(
+                         "{0}-{1}.{2:d03}", fileCount, fileSize, i);
+                }
+            }
+
+            string progressTextFile = String.Format("progress_{0}-{1}.txt", fileCount, fileSize);
+            CompressionTestUtil testUtil = new CompressionTestUtil(progressTextFile);
+
+            IList<ArchiveFileInfo> fileInfo;
+            using (ZipEngine zipEngine = new ZipEngine())
+            {
+                zipEngine.CompressionLevel = compLevel;
+
+                File.AppendAllText(progressTextFile,
+                    "\r\n\r\n====================================================\r\nCREATE\r\n\r\n");
+                zipEngine.Progress += testUtil.PrintArchiveProgress;
+
+                OptionStreamContext streamContext = new OptionStreamContext(archiveNames, dirA, null);
+                streamContext.OptionHandler =
+                    delegate(string optionName, object[] parameters)
+                    {
+                        // For testing purposes, force zip64 for only moderately large files.
+                        switch (optionName)
+                        {
+                            case  "forceZip64":
+                                return fileSize > UInt16.MaxValue;
+                            default:
+                                return null;
+                        }
+                    };
+
+                zipEngine.Pack(streamContext, files, maxArchiveSize);
+
+                string checkArchiveName = archiveNames[0];
+                if (File.Exists(archiveNames[1])) checkArchiveName = archiveNames[1];
+                using (Stream archiveStream = File.OpenRead(checkArchiveName))
+                {
+                    bool isArchive = zipEngine.IsArchive(archiveStream);
+                    Assert.IsTrue(isArchive, "Checking that created archive appears valid.");
+                }
+
+                IList<string> createdArchiveNames = new List<string>(archiveNames.Length);
+                for (int i = 0; i < archiveNames.Length; i++)
+                {
+                    if (File.Exists(archiveNames[i]))
+                    {
+                        createdArchiveNames.Add(archiveNames[i]);
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+
+                Assert.AreNotEqual<int>(0, createdArchiveNames.Count);
+
+                Console.WriteLine("Listing zip archive with {0} files of size {1}",
+                    fileCount, fileSize);
+                File.AppendAllText(progressTextFile, "\r\n\r\nLIST\r\n\r\n");
+                fileInfo = zipEngine.GetFileInfo(
+                    new ArchiveFileStreamContext(createdArchiveNames, null, null), null);
+
+                Assert.AreEqual<int>(fileCount, fileInfo.Count);
+
+                Console.WriteLine("Extracting zip archive with {0} files of size {1}",
+                    fileCount, fileSize);
+                File.AppendAllText(progressTextFile, "\r\n\r\nEXTRACT\r\n\r\n");
+                zipEngine.Unpack(new ArchiveFileStreamContext(createdArchiveNames, dirB, null), null);
+            }
+
+            bool directoryMatch = CompressionTestUtil.CompareDirectories(dirA, dirB);
+            Assert.IsTrue(directoryMatch,
+                "Testing whether zip output directory matches input directory.");
+
+            return fileInfo;
+        }
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/CompressionTestUtil.cs b/src/dtf/WixToolsetTests.Dtf.Compression/CompressionTestUtil.cs
new file mode 100644
index 00000000..e7a5373d
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.Compression/CompressionTestUtil.cs
@@ -0,0 +1,649 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Text;
+using System.Collections.Generic;
+using System.Security.Cryptography;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using WixToolset.Dtf.Compression;
+
+namespace WixToolset.Dtf.Test
+{
+    public class CompressionTestUtil
+    {
+        private static MD5 md5 = new MD5CryptoServiceProvider();
+
+        private string progressTextFile;
+
+        public CompressionTestUtil(string progressTextFile)
+        {
+            this.progressTextFile = progressTextFile;
+        }
+
+        public static IList<int[]> ExpectedProgress
+        {
+            get { return CompressionTestUtil.expectedProgress; }
+            set { CompressionTestUtil.expectedProgress = value; }
+        }
+        private static IList<int[]> expectedProgress;
+
+        public void PrintArchiveProgress(object source, ArchiveProgressEventArgs e)
+        {
+            switch (e.ProgressType)
+            {
+                case ArchiveProgressType.StartFile:
+                    {
+                        Console.WriteLine("StartFile: {0}", e.CurrentFileName);
+                    } break;
+                case ArchiveProgressType.FinishFile:
+                    {
+                        Console.WriteLine("FinishFile: {0}", e.CurrentFileName);
+                    } break;
+                case ArchiveProgressType.StartArchive:
+                    {
+                        Console.WriteLine("StartArchive: {0} : {1}", e.CurrentArchiveNumber, e.CurrentArchiveName);
+                    } break;
+                case ArchiveProgressType.FinishArchive:
+                    {
+                        Console.WriteLine("FinishArchive: {0} : {1}", e.CurrentArchiveNumber, e.CurrentArchiveName);
+                    } break;
+            }
+
+            File.AppendAllText(this.progressTextFile, e.ToString().Replace("\n", Environment.NewLine));
+
+            if (CompressionTestUtil.expectedProgress != null &&
+                e.ProgressType != ArchiveProgressType.PartialFile &&
+                e.ProgressType != ArchiveProgressType.PartialArchive)
+            {
+                Assert.AreNotEqual<int>(0, CompressionTestUtil.expectedProgress.Count);
+                int[] expected = CompressionTestUtil.expectedProgress[0];
+                CompressionTestUtil.expectedProgress.RemoveAt(0);
+                Assert.AreEqual<ArchiveProgressType>((ArchiveProgressType) expected[0], e.ProgressType, "Checking ProgressType.");
+                Assert.AreEqual<int>(expected[1], e.CurrentFileNumber, "Checking CurrentFileNumber.");
+                Assert.AreEqual<int>(expected[2], e.TotalFiles, "Checking TotalFiles.");
+                Assert.AreEqual<int>(expected[4], e.CurrentArchiveNumber, "Checking CurrentArchiveNumber.");
+                Assert.AreEqual<int>(expected[5], e.TotalArchives, "Checking TotalArchives.");
+            }
+        }
+
+        public static bool CompareDirectories(string dirA, string dirB)
+        {
+            bool difference = false;
+            Console.WriteLine("Comparing directories {0}, {1}", dirA, dirB);
+
+            string[] filesA = Directory.GetFiles(dirA);
+            string[] filesB = Directory.GetFiles(dirB);
+            for (int iA = 0; iA < filesA.Length; iA++)
+            {
+                filesA[iA] = Path.GetFileName(filesA[iA]);
+            }
+            for (int iB = 0; iB < filesB.Length; iB++)
+            {
+                filesB[iB] = Path.GetFileName(filesB[iB]);
+            }
+            Array.Sort(filesA);
+            Array.Sort(filesB);
+
+            for (int iA = 0, iB = 0; iA < filesA.Length || iB < filesB.Length; )
+            {
+                int comp;
+                if (iA == filesA.Length)
+                {
+                    comp = 1;
+                }
+                else if (iB == filesB.Length)
+                {
+                    comp = -1;
+                }
+                else
+                {
+                    comp = String.Compare(filesA[iA], filesB[iB]);
+                }
+                if (comp < 0)
+                {
+                    Console.WriteLine("< " + filesA[iA]);
+                    difference = true;
+                    iA++;
+                }
+                else if (comp > 0)
+                {
+                    Console.WriteLine("> " + filesB[iB]);
+                    difference = true;
+                    iB++;
+                }
+                else
+                {
+                    string fileA = Path.Combine(dirA, filesA[iA]);
+                    string fileB = Path.Combine(dirB, filesB[iB]);
+
+                    byte[] hashA;
+                    byte[] hashB;
+
+                    lock (CompressionTestUtil.md5)
+                    {
+                        using (Stream fileAStream = File.OpenRead(fileA))
+                        {
+                            hashA = CompressionTestUtil.md5.ComputeHash(fileAStream);
+                        }
+                        using (Stream fileBStream = File.OpenRead(fileB))
+                        {
+                            hashB = CompressionTestUtil.md5.ComputeHash(fileBStream);
+                        }
+                    }
+
+                    for (int i = 0; i < hashA.Length; i++)
+                    {
+                        if (hashA[i] != hashB[i])
+                        {
+                            Console.WriteLine("~  " + filesA[iA]);
+                            difference = true;
+                            break;
+                        }
+                    }
+
+                    iA++;
+                    iB++;
+                }
+            }
+
+            string[] dirsA = Directory.GetDirectories(dirA);
+            string[] dirsB = Directory.GetDirectories(dirB);
+            for (int iA = 0; iA < dirsA.Length; iA++)
+            {
+                dirsA[iA] = Path.GetFileName(dirsA[iA]);
+            }
+            for (int iB = 0; iB < dirsB.Length; iB++)
+            {
+                dirsB[iB] = Path.GetFileName(dirsB[iB]);
+            }
+            Array.Sort(dirsA);
+            Array.Sort(dirsB);
+
+            for (int iA = 0, iB = 0; iA < dirsA.Length || iB < dirsB.Length; )
+            {
+                int comp;
+                if (iA == dirsA.Length)
+                {
+                    comp = 1;
+                }
+                else if (iB == dirsB.Length)
+                {
+                    comp = -1;
+                }
+                else
+                {
+                    comp = String.Compare(dirsA[iA], dirsB[iB]);
+                }
+                if (comp < 0)
+                {
+                    Console.WriteLine("< {0}\\", dirsA[iA]);
+                    difference = true;
+                    iA++;
+                }
+                else if (comp > 0)
+                {
+                    Console.WriteLine("> {1}\\", dirsB[iB]);
+                    difference = true;
+                    iB++;
+                }
+                else
+                {
+                    string subDirA = Path.Combine(dirA, dirsA[iA]);
+                    string subDirB = Path.Combine(dirB, dirsB[iB]);
+                    if (!CompressionTestUtil.CompareDirectories(subDirA, subDirB))
+                    {
+                        difference = true;
+                    }
+                    iA++;
+                    iB++;
+                }
+            }
+
+            return !difference;
+        }
+
+
+        public static void GenerateRandomFile(string path, int seed, long size)
+        {
+            Console.WriteLine("Generating random file {0} (seed={1}, size={2})",
+                path, seed, size);
+            Random random = new Random(seed);
+            bool easy = random.Next(2) == 1;
+            int chunk = 1024 * random.Next(1, 100);
+            using (TextWriter tw = new StreamWriter(
+                File.Create(path, 4096), Encoding.ASCII))
+            {
+                for (long count = 0; count < size; count++)
+                {
+                    char c = (char) (easy ? random.Next('a', 'b' + 1)
+                        : random.Next(32, 127));
+                    tw.Write(c);
+                    if (--chunk == 0)
+                    {
+                        chunk = 1024 * random.Next(1, 101);
+                        easy = random.Next(2) == 1;
+                    }
+                }
+            }
+        }
+
+        public static void TestArchiveInfoNullParams(
+            ArchiveInfo archiveInfo,
+            string dirA,
+            string dirB,
+            string[] files)
+        {
+            Exception caughtEx = null;
+            try
+            {
+                archiveInfo.PackFiles(null, null, files);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.PackFiles(null, files, new string[] { });
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentOutOfRangeException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.PackFileSet(dirA, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.PackFiles(null, files, files);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(FileNotFoundException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.PackFiles(dirA, null, files);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.PackFiles(dirA, files, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Caught exception: " + caughtEx);
+
+            caughtEx = null;
+            try
+            {
+                archiveInfo.CopyTo(null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.CopyTo(null, true);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.MoveTo(null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.GetFiles(null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.UnpackFile(null, "test.txt");
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.UnpackFile("test.txt", null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.UnpackFiles(null, dirB, files);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.UnpackFiles(files, null, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.UnpackFiles(files, null, files);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.UnpackFiles(files, dirB, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.UnpackFiles(files, dirB, new string[] { });
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentOutOfRangeException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                archiveInfo.UnpackFileSet(null, dirB);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+        }
+
+        public static void TestCompressionEngineNullParams(
+            CompressionEngine engine,
+            ArchiveFileStreamContext streamContext,
+            string[] testFiles)
+        {
+            Exception caughtEx;
+
+            Console.WriteLine("Testing null streamContext.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(null, testFiles);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                engine.Pack(null, testFiles, 0);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+
+            Console.WriteLine("Testing null files.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(streamContext, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+
+            Console.WriteLine("Testing null files.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(streamContext, null, 0);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+
+
+            Console.WriteLine("Testing null stream.");
+            caughtEx = null;
+            try
+            {
+                engine.IsArchive(null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                engine.FindArchiveOffset(null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                engine.GetFiles(null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                engine.GetFileInfo(null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                engine.Unpack(null, "testUnpack.txt");
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing null streamContext.");
+            caughtEx = null;
+            try
+            {
+                engine.GetFiles(null, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                engine.GetFileInfo(null, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+            caughtEx = null;
+            try
+            {
+                engine.Unpack((IUnpackStreamContext) null, null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(ArgumentNullException), "Caught exception: " + caughtEx);
+        }
+
+        public static void TestBadPackStreamContexts(
+            CompressionEngine engine, string archiveName, string[] testFiles)
+        {
+            Exception caughtEx;
+
+            Console.WriteLine("Testing streamContext that returns null from GetName.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(
+                    new MisbehavingStreamContext(archiveName, null, null, false, false, true, true, true, true),
+                    testFiles);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx is FileNotFoundException, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that returns null from OpenArchive.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(
+                    new MisbehavingStreamContext(archiveName, null, null, false, true, false, true, true, true),
+                    testFiles);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx is FileNotFoundException, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that returns null from OpenFile.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(
+                    new MisbehavingStreamContext(archiveName, null, null, false, true, true, true, false, true),
+                    testFiles);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that throws on GetName.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(
+                    new MisbehavingStreamContext(archiveName, null, null, true, false, true, true, true, true),
+                    testFiles);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx != null && caughtEx.Message == MisbehavingStreamContext.EXCEPTION, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that throws on OpenArchive.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(
+                    new MisbehavingStreamContext(archiveName, null, null, true, true, false, true, true, true),
+                    testFiles);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx != null && caughtEx.Message == MisbehavingStreamContext.EXCEPTION, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that throws on CloseArchive.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(
+                    new MisbehavingStreamContext(archiveName, null, null, true, true, true, false, true, true),
+                    testFiles);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx != null && caughtEx.Message == MisbehavingStreamContext.EXCEPTION, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that throws on OpenFile.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(
+                    new MisbehavingStreamContext(archiveName, null, null, true, true, true, true, false, true),
+                    testFiles);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx != null && caughtEx.Message == MisbehavingStreamContext.EXCEPTION, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that throws on CloseFile.");
+            caughtEx = null;
+            try
+            {
+                engine.Pack(
+                    new MisbehavingStreamContext(archiveName, null, null, true, true, true, true, true, false),
+                    testFiles);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx != null && caughtEx.Message == MisbehavingStreamContext.EXCEPTION, "Caught exception: " + caughtEx);
+        }
+
+        public static void TestBadUnpackStreamContexts(
+            CompressionEngine engine, string archiveName)
+        {
+            Exception caughtEx;
+
+            Console.WriteLine("Testing streamContext that returns null from OpenArchive.");
+            caughtEx = null;
+            try
+            {
+                engine.Unpack(new MisbehavingStreamContext(archiveName, null, null, false, true, false, true, true, true), null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(FileNotFoundException), "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that returns null from OpenFile.");
+            caughtEx = null;
+            try
+            {
+                engine.Unpack(new MisbehavingStreamContext(archiveName, null, null, false, true, true, true, false, true), null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that throws on OpenArchive.");
+            caughtEx = null;
+            try
+            {
+                engine.Unpack(new MisbehavingStreamContext(archiveName, null, null, true, true, false, true, true, true), null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx != null && caughtEx.Message == MisbehavingStreamContext.EXCEPTION, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that throws on CloseArchive.");
+            caughtEx = null;
+            try
+            {
+                engine.Unpack(new MisbehavingStreamContext(archiveName, null, null, true, true, true, false, true, true), null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx != null && caughtEx.Message == MisbehavingStreamContext.EXCEPTION, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that throws on OpenFile.");
+            caughtEx = null;
+            try
+            {
+                engine.Unpack(new MisbehavingStreamContext(archiveName, null, null, true, true, true, true, false, true), null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx != null && caughtEx.Message == MisbehavingStreamContext.EXCEPTION, "Caught exception: " + caughtEx);
+            Console.WriteLine("Testing streamContext that throws on CloseFile.");
+            caughtEx = null;
+            try
+            {
+                engine.Unpack(new MisbehavingStreamContext(archiveName, null, null, true, true, true, true, true, false), null);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsTrue(caughtEx != null && caughtEx.Message == MisbehavingStreamContext.EXCEPTION, "Caught exception: " + caughtEx);
+        }
+
+        public static void TestTruncatedArchive(
+            ArchiveInfo archiveInfo, Type expectedExceptionType)
+        {
+            for (long len = archiveInfo.Length - 1; len >= 0; len--)
+            {
+                string testArchive = String.Format("{0}.{1:d06}",
+                    archiveInfo.FullName, len);
+                if (File.Exists(testArchive))
+                {
+                    File.Delete(testArchive);
+                }
+
+                archiveInfo.CopyTo(testArchive);
+                using (FileStream truncateStream =
+                    File.Open(testArchive, FileMode.Open, FileAccess.ReadWrite))
+                {
+                    truncateStream.SetLength(len);
+                }
+
+                ArchiveInfo testArchiveInfo = (ArchiveInfo) archiveInfo.GetType()
+                    .GetConstructor(new Type[] { typeof(string) }).Invoke(new object[] { testArchive });
+
+                Exception caughtEx = null;
+                try
+                {
+                    testArchiveInfo.GetFiles();
+                }
+                catch (Exception ex) { caughtEx = ex; }
+                File.Delete(testArchive);
+
+                if (caughtEx != null)
+                {
+                    Assert.IsInstanceOfType(caughtEx, expectedExceptionType,
+                        String.Format("Caught exception listing archive truncated to {0}/{1} bytes",
+                        len, archiveInfo.Length));
+                }
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/MisbehavingStreamContext.cs b/src/dtf/WixToolsetTests.Dtf.Compression/MisbehavingStreamContext.cs
new file mode 100644
index 00000000..2531f3bc
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.Compression/MisbehavingStreamContext.cs
@@ -0,0 +1,202 @@
+// 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.
+
+using System;
+using System.IO;
+using System.Collections.Generic;
+using WixToolset.Dtf.Compression;
+
+namespace WixToolset.Dtf.Test
+{
+    public class MisbehavingStreamContext : ArchiveFileStreamContext
+    {
+        public const string EXCEPTION = "Test exception.";
+
+        private bool throwEx;
+        private bool getName;
+        private bool openArchive;
+        private bool closeArchive;
+        private bool openFile;
+        private bool closeFile;
+        private int closeFileCount;
+
+        public MisbehavingStreamContext(
+            string cabinetFile,
+            string directory,
+            IDictionary<string, string> files,
+            bool throwEx,
+            bool getName,
+            bool openArchive,
+            bool closeArchive,
+            bool openFile,
+            bool closeFile)
+            : base(cabinetFile, directory, files)
+        {
+            this.throwEx = throwEx;
+            this.getName = getName;
+            this.openArchive = openArchive;
+            this.closeArchive = closeArchive;
+            this.openFile = openFile;
+            this.closeFile = closeFile;
+        }
+
+        public override string GetArchiveName(int archiveNumber)
+        {
+            if (!this.getName)
+            {
+                if (throwEx)
+                {
+                    throw new Exception(EXCEPTION);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            return base.GetArchiveName(archiveNumber);
+        }
+
+        public override Stream OpenArchiveWriteStream(
+            int archiveNumber,
+            string archiveName,
+            bool truncate,
+            CompressionEngine compressionEngine)
+        {
+            if (!this.openArchive)
+            {
+                if (throwEx)
+                {
+                    throw new Exception(EXCEPTION);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            return base.OpenArchiveWriteStream(
+                archiveNumber, archiveName, truncate, compressionEngine);
+        }
+
+        public override void CloseArchiveWriteStream(
+            int archiveNumber,
+            string archiveName,
+            Stream stream)
+        {
+            if (!this.closeArchive)
+            {
+                if (throwEx)
+                {
+                    this.closeArchive = true;
+                    throw new Exception(EXCEPTION);
+                }
+                return;
+            }
+            base.CloseArchiveWriteStream(archiveNumber, archiveName, stream);
+        }
+
+        public override Stream OpenFileReadStream(
+            string path,
+            out FileAttributes attributes,
+            out DateTime lastWriteTime)
+        {
+            if (!this.openFile)
+            {
+                if (throwEx)
+                {
+                    throw new Exception(EXCEPTION);
+                }
+                else
+                {
+                    attributes = FileAttributes.Normal;
+                    lastWriteTime = DateTime.MinValue;
+                    return null;
+                }
+            }
+            return base.OpenFileReadStream(path, out attributes, out lastWriteTime);
+        }
+
+        public override void CloseFileReadStream(string path, Stream stream)
+        {
+            if (!this.closeFile && ++closeFileCount == 2)
+            {
+                if (throwEx)
+                {
+                    throw new Exception(EXCEPTION);
+                }
+                return;
+            }
+            base.CloseFileReadStream(path, stream);
+        }
+
+        public override Stream OpenArchiveReadStream(
+            int archiveNumber,
+            string archiveName,
+            CompressionEngine compressionEngine)
+        {
+            if (!this.openArchive)
+            {
+                if (throwEx)
+                {
+                    throw new Exception(EXCEPTION);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            return base.OpenArchiveReadStream(archiveNumber, archiveName, compressionEngine);
+        }
+
+        public override void CloseArchiveReadStream(
+            int archiveNumber,
+            string archiveName,
+            Stream stream)
+        {
+            if (!this.closeArchive)
+            {
+                if (throwEx)
+                {
+                    this.closeArchive = true;
+                    throw new Exception(EXCEPTION);
+                }
+                return;
+            }
+            base.CloseArchiveReadStream(archiveNumber, archiveName, stream);
+        }
+
+        public override Stream OpenFileWriteStream(
+            string path,
+            long fileSize,
+            DateTime lastWriteTime)
+        {
+            if (!this.openFile)
+            {
+                if (throwEx)
+                {
+                    throw new Exception(EXCEPTION);
+                }
+                else
+                {
+                    return null;
+                }
+            }
+            return base.OpenFileWriteStream(path, fileSize, lastWriteTime);
+        }
+
+        public override void CloseFileWriteStream(
+            string path,
+            Stream stream,
+            FileAttributes attributes,
+            DateTime lastWriteTime)
+        {
+            if (!this.closeFile && ++closeFileCount == 2)
+            {
+                if (throwEx)
+                {
+                    throw new Exception(EXCEPTION);
+                }
+                return;
+            }
+            base.CloseFileWriteStream(path, stream, attributes, lastWriteTime);
+        }
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/OptionStreamContext.cs b/src/dtf/WixToolsetTests.Dtf.Compression/OptionStreamContext.cs
new file mode 100644
index 00000000..98354d97
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.Compression/OptionStreamContext.cs
@@ -0,0 +1,42 @@
+// 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.
+
+using System;
+using System.Collections.Generic;
+using WixToolset.Dtf.Compression;
+
+namespace WixToolset.Dtf.Test
+{
+    public class OptionStreamContext : ArchiveFileStreamContext
+    {
+        private PackOptionHandler packOptionHandler;
+
+        public OptionStreamContext(IList<string> archiveFiles, string directory, IDictionary<string, string> files)
+            : base(archiveFiles, directory, files)
+        {
+        }
+
+        public delegate object PackOptionHandler(string optionName, object[] parameters);
+
+        public PackOptionHandler OptionHandler
+        {
+            get
+            {
+                return this.packOptionHandler;
+            }
+            set
+            {
+                this.packOptionHandler = value;
+            }
+        }
+
+        public override object GetOption(string optionName, object[] parameters)
+        {
+            if (this.OptionHandler == null)
+            {
+                return null;
+            }
+
+            return this.OptionHandler(optionName, parameters);
+        }
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
new file mode 100644
index 00000000..120779ee
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.Compression/WixToolsetTests.Dtf.Compression.csproj
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- 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. -->
+
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ProjectGuid>{F045FFC1-05F9-4EA2-9F03-E1CBDB7BC4F9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>WixToolsetTests.Dtf</RootNamespace>
+    <AssemblyName>WixToolsetTests.Dtf.Compression</AssemblyName>
+    <CreateDocumentation>false</CreateDocumentation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="CompressionTestUtil.cs" />
+    <Compile Include="MisbehavingStreamContext.cs" />
+    <Compile Include="OptionStreamContext.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.Compression\WixToolset.Dtf.Compression.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/CustomActionTest.cs b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/CustomActionTest.cs
new file mode 100644
index 00000000..bf843024
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/CustomActionTest.cs
@@ -0,0 +1,206 @@
+// 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.Dtf.Test
+{
+    using System;
+    using System.IO;
+    using System.Text;
+    using System.Collections.Generic;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixToolset.Dtf.WindowsInstaller;
+
+    [TestClass]
+    public class CustomActionTest
+    {
+        public CustomActionTest()
+        {
+        }
+
+        [TestMethod]
+        [Ignore] // Currently fails.
+        public void CustomActionTest1()
+        {
+            InstallLogModes logEverything =
+                InstallLogModes.FatalExit |
+                InstallLogModes.Error |
+                InstallLogModes.Warning |
+                InstallLogModes.User |
+                InstallLogModes.Info |
+                InstallLogModes.ResolveSource |
+                InstallLogModes.OutOfDiskSpace |
+                InstallLogModes.ActionStart |
+                InstallLogModes.ActionData |
+                InstallLogModes.CommonData |
+                InstallLogModes.Progress |
+                InstallLogModes.Initialize |
+                InstallLogModes.Terminate |
+                InstallLogModes.ShowDialog;
+
+            Installer.SetInternalUI(InstallUIOptions.Silent);
+            ExternalUIHandler prevHandler = Installer.SetExternalUI(
+                WindowsInstallerTest.ExternalUILogger, logEverything);
+
+            try
+            {
+                string[] customActions = new string[] { "SampleCA1", "SampleCA2" };
+                #if DEBUG
+                string caDir = @"..\..\..\..\..\build\debug\x86\";
+                #else
+                string caDir = @"..\..\..\..\..\build\ship\x86\";
+                #endif
+                caDir = Path.GetFullPath(caDir);
+                string caFile = "WixToolset.Dtf.Samples.ManagedCA.dll";
+                string caProduct = "CustomActionTest.msi";
+
+                this.CreateCustomActionProduct(caProduct, caDir + caFile, customActions, false);
+
+                Exception caughtEx = null;
+                try
+                {
+                    Installer.InstallProduct(caProduct, String.Empty);
+                }
+                catch (Exception ex) { caughtEx = ex; }
+                Assert.IsInstanceOfType(caughtEx, typeof(InstallCanceledException),
+                    "Exception thrown while installing product: " + caughtEx);
+
+                string arch = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITECTURE");
+                string arch2 = Environment.GetEnvironmentVariable("PROCESSOR_ARCHITEW6432");
+                if (arch == "AMD64" || arch2 == "AMD64")
+                {
+                    caDir = caDir.Replace("x86", "x64");
+
+                    this.CreateCustomActionProduct(caProduct, caDir + caFile, customActions, true);
+
+                    caughtEx = null;
+                    try
+                    {
+                        Installer.InstallProduct(caProduct, String.Empty);
+                    }
+                    catch (Exception ex) { caughtEx = ex; }
+                    Assert.IsInstanceOfType(caughtEx, typeof(InstallCanceledException),
+                        "Exception thrown while installing 64bit product: " + caughtEx);
+                }
+            }
+            finally
+            {
+                Installer.SetExternalUI(prevHandler, InstallLogModes.None);
+            }
+        }
+
+        private void CreateCustomActionProduct(
+            string msiFile, string customActionFile, IList<string> customActions, bool sixtyFourBit)
+        {
+            using (Database db = new Database(msiFile, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db, sixtyFourBit);
+                WindowsInstallerUtils.CreateTestProduct(db);
+
+                if (!File.Exists(customActionFile))
+                    throw new FileNotFoundException(customActionFile);
+
+                using (Record binRec = new Record(2))
+                {
+                    binRec[1] = Path.GetFileName(customActionFile);
+                    binRec.SetStream(2, customActionFile);
+
+                    db.Execute("INSERT INTO `Binary` (`Name`, `Data`) VALUES (?, ?)", binRec);
+                }
+
+                using (Record binRec2 = new Record(2))
+                {
+                    binRec2[1] = "TestData";
+                    binRec2.SetStream(2, new MemoryStream(Encoding.UTF8.GetBytes("This is a test data stream.")));
+
+                    db.Execute("INSERT INTO `Binary` (`Name`, `Data`) VALUES (?, ?)", binRec2);
+                }
+
+                for (int i = 0; i < customActions.Count; i++)
+                {
+                    db.Execute(
+                        "INSERT INTO `CustomAction` (`Action`, `Type`, `Source`, `Target`) VALUES ('{0}', 1, '{1}', '{2}')",
+                        customActions[i],
+                        Path.GetFileName(customActionFile),
+                        customActions[i]);
+                    db.Execute(
+                        "INSERT INTO `InstallExecuteSequence` (`Action`, `Condition`, `Sequence`) VALUES ('{0}', '', {1})",
+                        customActions[i],
+                        101 + i);
+                }
+
+                db.Execute("INSERT INTO `Property` (`Property`, `Value`) VALUES ('SampleCATest', 'TestValue')");
+
+                db.Commit();
+            }
+        }
+
+        [TestMethod]
+        public void CustomActionData()
+        {
+            string dataString = "Key1=Value1;Key2=;Key3;Key4=Value=4;Key5";
+            string dataString2 = "Key1=;Key2=Value2;Key3;Key4;Key6=Value;;6=6;Key7=Value7";
+
+            CustomActionData data = new CustomActionData(dataString);
+            Assert.AreEqual<string>(dataString, data.ToString());
+
+            data["Key1"] = String.Empty;
+            data["Key2"] = "Value2";
+            data["Key4"] = null;
+            data.Remove("Key5");
+            data["Key6"] = "Value;6=6";
+            data["Key7"] = "Value7";
+
+            Assert.AreEqual<string>(dataString2, data.ToString());
+
+            MyDataClass myData = new MyDataClass();
+            myData.Member1 = "test1";
+            myData.Member2 = "test2";
+            data.AddObject("MyData", myData);
+
+            string myDataString = data.ToString();
+            CustomActionData data2 = new CustomActionData(myDataString);
+
+            MyDataClass myData2 = data2.GetObject<MyDataClass>("MyData");
+            Assert.AreEqual<MyDataClass>(myData, myData2);
+
+            List<string> myComplexDataObject = new List<string>();
+            myComplexDataObject.Add("CValue1");
+            myComplexDataObject.Add("CValue2");
+            myComplexDataObject.Add("CValue3");
+
+            CustomActionData myComplexData = new CustomActionData();
+            myComplexData.AddObject("MyComplexData", myComplexDataObject);
+            myComplexData.AddObject("NestedData", data);
+            string myComplexDataString = myComplexData.ToString();
+
+            CustomActionData myComplexData2 = new CustomActionData(myComplexDataString);
+            List<string> myComplexDataObject2 = myComplexData2.GetObject<List<string>>("MyComplexData");
+
+            Assert.AreEqual<int>(myComplexDataObject.Count, myComplexDataObject2.Count);
+            for (int i = 0; i < myComplexDataObject.Count; i++)
+            {
+                Assert.AreEqual<string>(myComplexDataObject[i], myComplexDataObject2[i]);
+            }
+
+            data2 = myComplexData2.GetObject<CustomActionData>("NestedData");
+            Assert.AreEqual<string>(data.ToString(), data2.ToString());
+        }
+
+        public class MyDataClass
+        {
+            public string Member1;
+            public string Member2;
+
+            public override bool Equals(object obj)
+            {
+                MyDataClass other = obj as MyDataClass;
+                return other != null && this.Member1 == other.Member1 && this.Member2 == other.Member2;
+            }
+
+            public override int GetHashCode()
+            {
+                return (this.Member1 != null ? this.Member1.GetHashCode() : 0) ^
+                       (this.Member2 != null ? this.Member2.GetHashCode() : 0);
+            }
+        }
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
new file mode 100644
index 00000000..aadd4592
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.CustomActions/WixToolsetTests.Dtf.WindowsInstaller.CustomActions.csproj
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectGuid>{137D376B-989F-4FEA-9A67-01D8D38CA0DE}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>WixToolsetTests.Dtf</RootNamespace>
+    <AssemblyName>WixToolsetTests.Dtf.WindowsInstaller.CustomActions</AssemblyName>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <CreateDocumentation>false</CreateDocumentation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="CustomActionTest.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="$(OutputPath)\WixToolset.Dtf.WindowsInstaller.dll" />
+    <ProjectReference Include="..\WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/LinqTest.cs b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/LinqTest.cs
new file mode 100644
index 00000000..7776a1c3
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/LinqTest.cs
@@ -0,0 +1,509 @@
+// 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.
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using WixToolset.Dtf.WindowsInstaller;
+using WixToolset.Dtf.WindowsInstaller.Linq;
+
+namespace WixToolset.Dtf.Test
+{
+    [TestClass]
+    public class LinqTest
+    {
+        private void InitLinqTestDatabase(QDatabase db)
+        {
+            WindowsInstallerUtils.InitializeProductDatabase(db);
+            WindowsInstallerUtils.CreateTestProduct(db);
+
+            db.Execute(
+                "INSERT INTO `Feature` (`Feature`, `Title`, `Description`, `Level`, `Attributes`) VALUES ('{0}', '{1}', '{2}', {3}, {4})",
+                "TestFeature2",
+                "Test Feature 2",
+                "Test Feature 2 Description",
+                1,
+                (int) FeatureAttributes.None);
+
+            WindowsInstallerUtils.AddRegistryComponent(
+                db, "TestFeature2", "MyTestRegComp",
+                Guid.NewGuid().ToString("B"),
+                "SOFTWARE\\Microsoft\\DTF\\Test",
+                "MyTestRegComp", "test");
+            WindowsInstallerUtils.AddRegistryComponent(
+                db, "TestFeature2", "MyTestRegComp2",
+                Guid.NewGuid().ToString("B"),
+                "SOFTWARE\\Microsoft\\DTF\\Test",
+                "MyTestRegComp2", "test2");
+            WindowsInstallerUtils.AddRegistryComponent(
+                db, "TestFeature2", "excludeComp",
+                Guid.NewGuid().ToString("B"),
+                "SOFTWARE\\Microsoft\\DTF\\Test",
+                "MyTestRegComp3", "test3");
+
+            db.Commit();
+
+            db.Log = Console.Out;
+        }
+
+        [TestMethod]
+        public void LinqSimple()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+
+                var comps = from c in db.Components
+                            select c;
+
+                int count = 0;
+                foreach (var c in comps)
+                {
+                    Console.WriteLine(c);
+                    count++;
+                }
+
+                Assert.AreEqual<int>(4, count);
+            }
+        }
+
+        [TestMethod]
+        public void LinqWhereNull()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+
+                var features = from f in db.Features
+                               where f.Description != null
+                               select f;
+
+                int count = 0;
+                foreach (var f in features)
+                {
+                    Console.WriteLine(f);
+                    Assert.AreEqual<string>("TestFeature2", f.Feature);
+                    count++;
+                }
+
+                Assert.AreEqual<int>(1, count);
+
+                var features2 = from f in db.Features
+                                where f.Description == null
+                                select f;
+
+                count = 0;
+                foreach (var f in features2)
+                {
+                    Console.WriteLine(f);
+                    Assert.AreEqual<string>("TestFeature1", f.Feature);
+                    count++;
+                }
+
+                Assert.AreEqual<int>(1, count);
+            }
+        }
+
+        [TestMethod]
+        public void LinqWhereOperators()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+
+                for (int i = 0; i < 100; i++)
+                {
+                    var newFile = db.Files.NewRecord();
+                    newFile.File = "TestFile" + i;
+                    newFile.Component_ = "TestComponent";
+                    newFile.FileName = "TestFile" + i + ".txt";
+                    newFile.FileSize = i % 10;
+                    newFile.Sequence = i;
+                    newFile.Insert();
+                }
+
+                var files1 = from f in db.Files where f.Sequence < 40 select f;
+                Assert.AreEqual<int>(40, files1.AsEnumerable().Count());
+
+                var files2 = from f in db.Files where f.Sequence <= 40 select f;
+                Assert.AreEqual<int>(41, files2.AsEnumerable().Count());
+
+                var files3 = from f in db.Files where f.Sequence > 40 select f;
+                Assert.AreEqual<int>(59, files3.AsEnumerable().Count());
+
+                var files4 = from f in db.Files where f.Sequence >= 40 select f;
+                Assert.AreEqual<int>(60, files4.AsEnumerable().Count());
+
+                var files5 = from f in db.Files where 40 < f.Sequence select f;
+                Assert.AreEqual<int>(59, files5.AsEnumerable().Count());
+
+                var files6 = from f in db.Files where 40 <= f.Sequence select f;
+                Assert.AreEqual<int>(60, files6.AsEnumerable().Count());
+
+                var files7 = from f in db.Files where 40 > f.Sequence select f;
+                Assert.AreEqual<int>(40, files7.AsEnumerable().Count());
+
+                var files8 = from f in db.Files where 40 >= f.Sequence select f;
+                Assert.AreEqual<int>(41, files8.AsEnumerable().Count());
+
+                var files9 = from f in db.Files where f.Sequence == 40 select f;
+                Assert.AreEqual<int>(40, files9.AsEnumerable().First().Sequence);
+
+                var files10 = from f in db.Files where f.Sequence != 40 select f;
+                Assert.AreEqual<int>(99, files10.AsEnumerable().Count());
+
+                var files11 = from f in db.Files where 40 == f.Sequence select f;
+                Assert.AreEqual<int>(40, files11.AsEnumerable().First().Sequence);
+
+                var files12 = from f in db.Files where 40 != f.Sequence select f;
+                Assert.AreEqual<int>(99, files12.AsEnumerable().Count());
+            }
+        }
+
+        [TestMethod]
+        public void LinqShapeSelect()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+
+                Console.WriteLine("Running LINQ query 1.");
+                var features1 = from f in db.Features
+                                select new { Name = f.Feature,
+                                             Desc = f.Description };
+
+                int count = 0;
+                foreach (var f in features1)
+                {
+                    Console.WriteLine(f);
+                    count++;
+                }
+
+                Assert.AreEqual<int>(2, count);
+
+                Console.WriteLine();
+                Console.WriteLine("Running LINQ query 2.");
+                var features2 = from f in db.Features
+                                where f.Description != null
+                                select new { Name = f.Feature,
+                                             Desc = f.Description.ToLower() };
+
+                count = 0;
+                foreach (var f in features2)
+                {
+                    Console.WriteLine(f);
+                    Assert.AreEqual<string>("TestFeature2", f.Name);
+                    count++;
+                }
+
+                Assert.AreEqual<int>(1, count);
+            }
+        }
+
+        [TestMethod]
+        public void LinqUpdateNullableString()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+
+                string newDescription = "New updated feature description.";
+
+                var features = from f in db.Features
+                               where f.Description != null
+                               select f;
+
+                int count = 0;
+                foreach (var f in features)
+                {
+                    Console.WriteLine(f);
+                    Assert.AreEqual<string>("TestFeature2", f.Feature);
+                    f.Description = newDescription;
+                    count++;
+                }
+
+                Assert.AreEqual<int>(1, count);
+
+                var features2 = from f in db.Features
+                                where f.Description == newDescription
+                                select f;
+                count = 0;
+                foreach (var f in features2)
+                {
+                    Console.WriteLine(f);
+                    Assert.AreEqual<string>("TestFeature2", f.Feature);
+                    f.Description = null;
+                    count++;
+                }
+
+                Assert.AreEqual<int>(1, count);
+
+                var features3 = from f in db.Features
+                                where f.Description == null
+                                select f.Feature;
+                count = 0;
+                foreach (var f in features3)
+                {
+                    Console.WriteLine(f);
+                    count++;
+                }
+
+                Assert.AreEqual<int>(2, count);
+
+                db.Commit();
+            }
+        }
+
+        [TestMethod]
+        public void LinqInsertDelete()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+
+                var newProp = db.Properties.NewRecord();
+                newProp.Property = "TestNewProp1";
+                newProp.Value = "TestNewValue";
+                newProp.Insert();
+
+                string prop = (from p in db.Properties
+                            where p.Property == "TestNewProp1"
+                            select p.Value).AsEnumerable().First();
+                Assert.AreEqual<string>("TestNewValue", prop);
+
+                newProp.Delete();
+
+                int propCount = (from p in db.Properties
+                                 where p.Property == "TestNewProp1"
+                                 select p.Value).AsEnumerable().Count();
+                Assert.AreEqual<int>(0, propCount);
+
+                db.Commit();
+            }
+        }
+
+        [TestMethod]
+        public void LinqQueryQRecord()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+
+                var installFilesSeq = (from a in db["InstallExecuteSequence"]
+                                       where a["Action"] == "InstallFiles"
+                                       select a["Sequence"]).AsEnumerable().First();
+                Assert.AreEqual<string>("4000", installFilesSeq);
+            }
+        }
+
+        [TestMethod]
+        public void LinqOrderBy()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+
+                var actions = from a in db.InstallExecuteSequences
+                              orderby a.Sequence
+                              select a.Action;
+                foreach (var a in actions)
+                {
+                    Console.WriteLine(a);
+                }
+
+                var files = from f in db.Files
+                            orderby f.FileSize, f["Sequence"]
+                            where f.Attributes == FileAttributes.None
+                            select f;
+
+                foreach (var f in files)
+                {
+                    Console.WriteLine(f);
+                }
+            }
+        }
+
+        [TestMethod]
+        public void LinqTwoWayJoin()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+                int count;
+
+                var regs = from r in db.Registries
+                           join c in db["Component"] on r.Component_ equals c["Component"]
+                           where c["Component"] == "MyTestRegComp" &&
+                                 r.Root == RegistryRoot.UserOrMachine
+                           select new { Reg = r.Registry, Dir = c["Directory_"] };
+
+                count = 0;
+                foreach (var r in regs)
+                {
+                    Console.WriteLine(r);
+                    count++;
+                }
+                Assert.AreEqual<int>(1, count);
+
+                var regs2 = from r in db.Registries
+                            join c in db.Components on r.Component_ equals c.Component
+                            where c.Component == "MyTestRegComp" &&
+                                  r.Root == RegistryRoot.UserOrMachine
+                            select new { Reg = r, Dir = c.Directory_ };
+
+                count = 0;
+                foreach (var r in regs2)
+                {
+                    Assert.IsNotNull(r.Reg.Registry);
+                    Console.WriteLine(r);
+                    count++;
+                }
+                Assert.AreEqual<int>(1, count);
+
+                var regs3 = from r in db.Registries
+                            join c in db.Components on r.Component_ equals c.Component
+                            where c.Component == "MyTestRegComp" &&
+                                  r.Root == RegistryRoot.UserOrMachine
+                            select r;
+
+                count = 0;
+                foreach (var r in regs3)
+                {
+                    Assert.IsNotNull(r.Registry);
+                    Console.WriteLine(r);
+                    count++;
+                }
+                Assert.AreEqual<int>(1, count);
+
+            }
+        }
+
+        [TestMethod]
+        public void LinqFourWayJoin()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+                int count;
+
+                IList<string> pretest = db.ExecuteStringQuery(
+                    "SELECT `Feature`.`Feature` " +
+                    "FROM `Feature`, `FeatureComponents`, `Component`, `Registry` " +
+                    "WHERE `Feature`.`Feature` = `FeatureComponents`.`Feature_` " +
+                    "AND `FeatureComponents`.`Component_` = `Component`.`Component` " +
+                    "AND `Component`.`Component` = `Registry`.`Component_` " +
+                    "AND (`Registry`.`Registry` = 'MyTestRegCompReg1')");
+                Assert.AreEqual<int>(1, pretest.Count);
+
+                var features = from f in db.Features
+                               join fc in db.FeatureComponents on f.Feature equals fc.Feature_
+                               join c in db.Components on fc.Component_ equals c.Component
+                               join r in db.Registries on c.Component equals r.Component_
+                               where r.Registry == "MyTestRegCompReg1"
+                               select f.Feature;
+
+                count = 0;
+                foreach (var featureName in features)
+                {
+                    Console.WriteLine(featureName);
+                    count++;
+                }
+                Assert.AreEqual<int>(1, count);
+
+            }
+        }
+
+        [TestMethod]
+        public void EnumTable()
+        {
+            using (QDatabase db = new QDatabase("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                this.InitLinqTestDatabase(db);
+                int count = 0;
+                foreach (var comp in db.Components)
+                {
+                    Console.WriteLine(comp);
+                    count++;
+                }
+                Assert.AreNotEqual<int>(0, count);
+            }
+        }
+
+        [TestMethod]
+        public void DatabaseAsQueryable()
+        {
+            using (Database db = new Database("testlinq.msi", DatabaseOpenMode.Create))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db);
+                WindowsInstallerUtils.CreateTestProduct(db);
+
+                var comps = from c in db.AsQueryable().Components
+                            select c;
+
+                int count = 0;
+                foreach (var c in comps)
+                {
+                    Console.WriteLine(c);
+                    count++;
+                }
+
+                Assert.AreEqual<int>(1, count);
+            }
+        }
+
+        [TestMethod]
+        public void EnumProducts()
+        {
+            var products = from p in ProductInstallation.AllProducts
+                           where p.Publisher == ".NET Foundation"
+                           select new { Name = p.ProductName,
+                                        Ver = p.ProductVersion,
+                                        Company = p.Publisher,
+                                        InstallDate = p.InstallDate,
+                                        PackageCode = p.AdvertisedPackageCode };
+
+            foreach (var p in products)
+            {
+                Console.WriteLine(p);
+                Assert.IsTrue(p.Company == ".NET Foundation");
+            }
+        }
+
+        [TestMethod]
+        public void EnumFeatures()
+        {
+            foreach (var p in ProductInstallation.AllProducts)
+            {
+                Console.WriteLine(p.ProductName);
+
+                foreach (var f in p.Features)
+                {
+                    Console.WriteLine("\t" + f.FeatureName);
+                }
+            }
+        }
+
+        [TestMethod]
+        public void EnumComponents()
+        {
+            var comps = from c in ComponentInstallation.AllComponents
+                        where c.State == InstallState.Local &&
+                              c.Product.Publisher == ".NET Foundation"
+                        select c.Path;
+
+            int count = 0;
+            foreach (var c in comps)
+            {
+                if (++count == 100) break;
+
+                Console.WriteLine(c);
+            }
+
+            Assert.AreEqual<int>(100, count);
+        }
+    }
+
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
new file mode 100644
index 00000000..0dc90860
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller.Linq/WixToolsetTests.Dtf.WindowsInstaller.Linq.csproj
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- 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. -->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectGuid>{4F55F9B8-D8B6-41EB-8796-221B4CD98324}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>WixToolsetTests.Dtf</RootNamespace>
+    <AssemblyName>WixToolsetTests.Dtf.Linq</AssemblyName>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <CreateDocumentation>false</CreateDocumentation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="LinqTest.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" />
+    <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller.Linq\WixToolset.Dtf.WindowsInstaller.Linq.csproj" />
+    <ProjectReference Include="..\WixToolsetTests.Dtf.WindowsInstaller\WixToolsetTests.Dtf.WindowsInstaller.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/EmbeddedExternalUI.cs b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/EmbeddedExternalUI.cs
new file mode 100644
index 00000000..b0fc00a8
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/EmbeddedExternalUI.cs
@@ -0,0 +1,173 @@
+// 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.Dtf.Test
+{
+    using System;
+    using System.IO;
+    using System.Reflection;
+    using System.Windows.Forms;
+    using System.Globalization;
+    using System.Collections.Generic;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixToolset.Dtf.WindowsInstaller;
+    using View = WixToolset.Dtf.WindowsInstaller.View;
+
+    [TestClass]
+    public class EmbeddedExternalUI
+    {
+        const InstallLogModes TestLogModes =
+                InstallLogModes.FatalExit |
+                InstallLogModes.Error |
+                InstallLogModes.Warning |
+                InstallLogModes.User |
+                InstallLogModes.Info |
+                InstallLogModes.ResolveSource |
+                InstallLogModes.OutOfDiskSpace |
+                InstallLogModes.ActionStart |
+                InstallLogModes.ActionData |
+                InstallLogModes.CommonData;
+
+#if DEBUG
+        const string EmbeddedUISampleBinDir = @"..\..\build\debug\";
+#else
+        const string EmbeddedUISampleBinDir = @"..\..\build\release\";
+#endif
+
+        [TestMethod]
+        [Ignore] // Requires elevation.
+        public void EmbeddedUISingleInstall()
+        {
+            string dbFile = "EmbeddedUISingleInstall.msi";
+            string productCode;
+
+            string uiDir = Path.GetFullPath(EmbeddedExternalUI.EmbeddedUISampleBinDir);
+            string uiFile = "WixToolset.Dtf.Samples.EmbeddedUI.dll";
+
+            using (Database db = new Database(dbFile, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db);
+                WindowsInstallerUtils.CreateTestProduct(db);
+
+                productCode = db.ExecuteStringQuery("SELECT `Value` FROM `Property` WHERE `Property` = 'ProductCode'")[0];
+
+                using (Record uiRec = new Record(5))
+                {
+                    uiRec[1] = "TestEmbeddedUI";
+                    uiRec[2] = Path.GetFileNameWithoutExtension(uiFile) + ".Wrapper.dll";
+                    uiRec[3] = 1;
+                    uiRec[4] = (int) (
+                        EmbeddedExternalUI.TestLogModes |
+                        InstallLogModes.Progress |
+                        InstallLogModes.Initialize |
+                        InstallLogModes.Terminate |
+                        InstallLogModes.ShowDialog);
+                    uiRec.SetStream(5, Path.Combine(uiDir, uiFile));
+                    db.Execute(db.Tables["MsiEmbeddedUI"].SqlInsertString, uiRec);
+                }
+
+                db.Commit();
+            }
+
+            Installer.SetInternalUI(InstallUIOptions.Full);
+
+            ProductInstallation installation = new ProductInstallation(productCode);
+            Assert.IsFalse(installation.IsInstalled, "Checking that product is not installed before starting.");
+
+            Exception caughtEx = null;
+            try
+            {
+                Installer.EnableLog(EmbeddedExternalUI.TestLogModes, "install.log");
+                Installer.InstallProduct(dbFile, String.Empty);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Exception thrown while installing product: " + caughtEx);
+
+            Assert.IsTrue(installation.IsInstalled, "Checking that product is installed.");
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine("===================================================================");
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine();
+
+            try
+            {
+                Installer.EnableLog(EmbeddedExternalUI.TestLogModes, "uninstall.log");
+                Installer.InstallProduct(dbFile, "REMOVE=All");
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Exception thrown while uninstalling product: " + caughtEx);
+        }
+
+        // This test does not pass if run normally.
+        // It only passes when a failure is injected into the EmbeddedUI launcher.
+        ////[TestMethod]
+        public void EmbeddedUIInitializeFails()
+        {
+            string dbFile = "EmbeddedUIInitializeFails.msi";
+            string productCode;
+
+            string uiDir = Path.GetFullPath(EmbeddedExternalUI.EmbeddedUISampleBinDir);
+            string uiFile = "WixToolset.Dtf.Samples.EmbeddedUI.dll";
+
+            // A number that will be used to check whether a type 19 CA runs.
+            const string magicNumber = "3.14159265358979323846264338327950";
+
+            using (Database db = new Database(dbFile, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db);
+                WindowsInstallerUtils.CreateTestProduct(db);
+
+                const string failureActionName = "EmbeddedUIInitializeFails";
+                db.Execute("INSERT INTO `CustomAction` (`Action`, `Type`, `Source`, `Target`) " +
+                    "VALUES ('{0}', 19, '', 'Logging magic number: {1}')", failureActionName, magicNumber);
+
+                // This type 19 CA (launch condition) is given a condition of 'UILevel = 3' so that it only runs if the
+                // installation is running in BASIC UI mode, which is what we expect if the EmbeddedUI fails to initialize.
+                db.Execute("INSERT INTO `InstallExecuteSequence` (`Action`, `Condition`, `Sequence`) " +
+                    "VALUES ('{0}', 'UILevel = 3', 1)", failureActionName);
+
+                productCode = db.ExecuteStringQuery("SELECT `Value` FROM `Property` WHERE `Property` = 'ProductCode'")[0];
+
+                using (Record uiRec = new Record(5))
+                {
+                    uiRec[1] = "TestEmbeddedUI";
+                    uiRec[2] = Path.GetFileNameWithoutExtension(uiFile) + ".Wrapper.dll";
+                    uiRec[3] = 1;
+                    uiRec[4] = (int)(
+                        EmbeddedExternalUI.TestLogModes |
+                        InstallLogModes.Progress |
+                        InstallLogModes.Initialize |
+                        InstallLogModes.Terminate |
+                        InstallLogModes.ShowDialog);
+                    uiRec.SetStream(5, Path.Combine(uiDir, uiFile));
+                    db.Execute(db.Tables["MsiEmbeddedUI"].SqlInsertString, uiRec);
+                }
+
+                db.Commit();
+            }
+
+            Installer.SetInternalUI(InstallUIOptions.Full);
+
+            ProductInstallation installation = new ProductInstallation(productCode);
+            Assert.IsFalse(installation.IsInstalled, "Checking that product is not installed before starting.");
+
+            string logFile = "install.log";
+            Exception caughtEx = null;
+            try
+            {
+                Installer.EnableLog(EmbeddedExternalUI.TestLogModes, logFile);
+                Installer.InstallProduct(dbFile, String.Empty);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsInstanceOfType(caughtEx, typeof(InstallerException),
+                "Excpected InstallerException installing product; caught: " + caughtEx);
+
+            Assert.IsFalse(installation.IsInstalled, "Checking that product is not installed.");
+
+            string logText = File.ReadAllText(logFile);
+            Assert.IsTrue(logText.Contains(magicNumber), "Checking that the type 19 custom action ran.");
+        }
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/Schema.cs b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/Schema.cs
new file mode 100644
index 00000000..26c172c9
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/Schema.cs
@@ -0,0 +1,238 @@
+// 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.Dtf.Test
+{
+    using System;
+    using System.IO;
+    using System.Collections.Generic;
+    using System.Text;
+    using WixToolset.Dtf.WindowsInstaller;
+
+    public static class Schema
+    {
+        public static IList<TableInfo> Tables
+        {
+            get
+            {
+                return new TableInfo[]
+                {
+                    Binary,
+                    Component,
+                    CustomAction,
+                    Directory,
+                    EmbeddedUI,
+                    Feature,
+                    FeatureComponents,
+                    File,
+                    InstallExecuteSequence,
+                    Media,
+                    Property,
+                    Registry
+                };
+            }
+        }
+
+        #region Table data
+
+        public static TableInfo Binary { get { return new TableInfo(
+            "Binary",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("Name", typeof(String), 72, true),
+                new ColumnInfo("Data", typeof(Stream),  0, true),
+            },
+            new string[] { "Name" });
+        } }
+
+        public static TableInfo Component { get { return new TableInfo(
+            "Component",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("Component",   typeof(String),  72, true),
+                new ColumnInfo("ComponentId", typeof(String),  38, false),
+                new ColumnInfo("Directory_",  typeof(String),  72, true),
+                new ColumnInfo("Attributes",  typeof(Int16),    2, true),
+                new ColumnInfo("Condition",   typeof(String), 255, false),
+                new ColumnInfo("KeyPath",     typeof(String),  72, false),
+            },
+            new string[] { "Component" });
+        } }
+
+        public static TableInfo CustomAction { get { return new TableInfo(
+            "CustomAction",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("Action", typeof(String),  72, true),
+                new ColumnInfo("Type",   typeof(Int16),    2, true),
+                new ColumnInfo("Source", typeof(String),  64, false),
+                new ColumnInfo("Target", typeof(String), 255, false),
+            },
+            new string[] { "Action" });
+        } }
+
+        public static TableInfo Directory { get { return new TableInfo(
+            "Directory",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("Directory",        typeof(String),  72, true),
+                new ColumnInfo("Directory_Parent", typeof(String),  72, false),
+                new ColumnInfo("DefaultDir",       typeof(String), 255, true, false, true),
+            },
+            new string[] { "Directory" });
+        } }
+
+        public static TableInfo EmbeddedUI { get { return new TableInfo(
+            "MsiEmbeddedUI",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("MsiEmbeddedUI", typeof(String), 72, true),
+                new ColumnInfo("FileName",      typeof(String), 72, true),
+                new ColumnInfo("Attributes",    typeof(Int16),   2, true),
+                new ColumnInfo("MessageFilter", typeof(Int32),   4, false),
+                new ColumnInfo("Data",          typeof(Stream),  0, true),
+            },
+            new string[] { "MsiEmbeddedUI" });
+        } }
+
+        public static TableInfo Feature { get { return new TableInfo(
+            "Feature",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("Feature",        typeof(String),  38, true),
+                new ColumnInfo("Feature_Parent", typeof(String),  38, false),
+                new ColumnInfo("Title",          typeof(String),  64, false, false, true),
+                new ColumnInfo("Description",    typeof(String),  64, false, false, true),
+                new ColumnInfo("Display",        typeof(Int16),    2, false),
+                new ColumnInfo("Level",          typeof(Int16),    2, true),
+                new ColumnInfo("Directory_",     typeof(String),  72, false),
+                new ColumnInfo("Attributes",     typeof(Int16),    2, true),
+            },
+            new string[] { "Feature" });
+        } }
+
+        public static TableInfo FeatureComponents { get { return new TableInfo(
+            "FeatureComponents",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("Feature_",   typeof(String),  38, true),
+                new ColumnInfo("Component_", typeof(String),  72, true),
+            },
+            new string[] { "Feature_", "Component_" });
+        } }
+
+        public static TableInfo File { get { return new TableInfo(
+            "File",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("File",       typeof(String),  72, true),
+                new ColumnInfo("Component_", typeof(String),  72, true),
+                new ColumnInfo("FileName",   typeof(String), 255, true, false, true),
+                new ColumnInfo("FileSize",   typeof(Int32),    4, true),
+                new ColumnInfo("Version",    typeof(String),  72, false),
+                new ColumnInfo("Language",   typeof(String),  20, false),
+                new ColumnInfo("Attributes", typeof(Int16),    2, false),
+                new ColumnInfo("Sequence",   typeof(Int16),    2, true),
+            },
+            new string[] { "File" });
+        } }
+
+        public static TableInfo InstallExecuteSequence { get { return new TableInfo(
+            "InstallExecuteSequence",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("Action",    typeof(String),  72, true),
+                new ColumnInfo("Condition", typeof(String), 255, false),
+                new ColumnInfo("Sequence",  typeof(Int16),    2, true),
+            },
+            new string[] { "Action" });
+        } }
+
+        public static TableInfo Media { get { return new TableInfo(
+            "Media",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("DiskId",       typeof(Int16),    2, true),
+                new ColumnInfo("LastSequence", typeof(Int16),    2, true),
+                new ColumnInfo("DiskPrompt",   typeof(String),  64, false, false, true),
+                new ColumnInfo("Cabinet",      typeof(String), 255, false),
+                new ColumnInfo("VolumeLabel",  typeof(String),  32, false),
+                new ColumnInfo("Source",       typeof(String),  32, false),
+            },
+            new string[] { "DiskId" });
+        } }
+
+        public static TableInfo Property { get { return new TableInfo(
+            "Property",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("Property", typeof(String),  72, true),
+                new ColumnInfo("Value",    typeof(String), 255, true),
+            },
+            new string[] { "Property" });
+        } }
+
+        public static TableInfo Registry { get { return new TableInfo(
+            "Registry",
+            new ColumnInfo[]
+            {
+                new ColumnInfo("Registry",   typeof(String),  72, true),
+                new ColumnInfo("Root",       typeof(Int16),    2, true),
+                new ColumnInfo("Key",        typeof(String), 255, true, false, true),
+                new ColumnInfo("Name",       typeof(String), 255, false, false, true),
+                new ColumnInfo("Value",      typeof(String),   0, false, false, true),
+                new ColumnInfo("Component_", typeof(String),  72, true),
+            },
+            new string[] { "Registry" });
+        } }
+
+        #endregion
+
+    }
+
+    public class Action
+    {
+        public readonly string Name;
+        public readonly int Sequence;
+
+        public Action(string name, int sequence)
+        {
+            this.Name = name;
+            this.Sequence = sequence;
+        }
+
+    }
+
+    public class Sequence
+    {
+        public static IList<Action> InstallExecute
+        {
+            get
+            {
+                return new Action[]
+                {
+                    new Action("CostInitialize",        800),
+                    new Action("FileCost",              900),
+                    new Action("CostFinalize",         1000),
+                    new Action("InstallValidate",      1400),
+                    new Action("InstallInitialize",    1500),
+                    new Action("ProcessComponents",    1600),
+                    new Action("UnpublishComponents",  1700),
+                    new Action("UnpublishFeatures",    1800),
+                    new Action("RemoveRegistryValues", 2600),
+                    new Action("RemoveFiles",          3500),
+                    new Action("RemoveFolders",        3600),
+                    new Action("CreateFolders",        3700),
+                    new Action("MoveFiles",            3800),
+                    new Action("InstallFiles",         4000),
+                    new Action("WriteRegistryValues",  5000),
+                    new Action("RegisterProduct",      6100),
+                    new Action("PublishComponents",    6200),
+                    new Action("PublishFeatures",      6300),
+                    new Action("PublishProduct",       6400),
+                    new Action("InstallFinalize",      6600),
+                };
+            }
+        }
+
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTest.cs b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTest.cs
new file mode 100644
index 00000000..f994dfef
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTest.cs
@@ -0,0 +1,409 @@
+// 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.Dtf.Test
+{
+    using System;
+    using System.IO;
+    using System.Windows.Forms;
+    using System.Globalization;
+    using System.Collections.Generic;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixToolset.Dtf.WindowsInstaller;
+    using View = WixToolset.Dtf.WindowsInstaller.View;
+
+    [TestClass]
+    public class WindowsInstallerTest
+    {
+        public WindowsInstallerTest()
+        {
+        }
+
+        [TestInitialize()]
+        public void Initialize()
+        {
+        }
+
+        [TestCleanup()]
+        public void Cleanup()
+        {
+        }
+
+        [TestMethod]
+        [Ignore] // Currently fails.
+        public void InstallerErrorMessages()
+        {
+            string msg3002 = Installer.GetErrorMessage(3002);
+            Console.WriteLine("3002=" + msg3002);
+            Assert.IsNotNull(msg3002);
+            Assert.IsTrue(msg3002.Length > 0);
+        }
+
+        [TestMethod]
+        public void InstallerDatabaseSchema()
+        {
+            string dbFile = "InstallerDatabaseSchema.msi";
+
+            using (Database db = new Database(dbFile, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db);
+                db.Commit();
+            }
+
+            Assert.IsTrue(File.Exists(dbFile), "Checking whether created database file " + dbFile + " exists.");
+
+            using (Database db = new Database(dbFile, DatabaseOpenMode.ReadOnly))
+            {
+                TableCollection tables = db.Tables;
+                Assert.AreEqual<int>(Schema.Tables.Count, tables.Count, "Counting tables.");
+                Assert.AreEqual<int>(Schema.Property.Columns.Count, tables["Property"].Columns.Count, "Counting columns in Property table.");
+
+                foreach (TableInfo tableInfo in tables)
+                {
+                    Console.WriteLine(tableInfo.Name);
+                    foreach (ColumnInfo columnInfo in tableInfo.Columns)
+                    {
+                        Console.WriteLine("\t{0} {1}", columnInfo.Name, columnInfo.ColumnDefinitionString);
+                    }
+                }
+            }
+        }
+
+        [TestMethod]
+        public void InstallerViewTables()
+        {
+            string dbFile = "InstallerViewTables.msi";
+
+            using (Database db = new Database(dbFile, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db);
+                db.Commit();
+
+                using (View view1 = db.OpenView("SELECT `Property`, `Value` FROM `Property` WHERE `Value` IS NOT NULL"))
+                {
+                    IList<TableInfo> viewTables = view1.Tables;
+                    Assert.IsNotNull(viewTables);
+                    Assert.AreEqual<int>(1, viewTables.Count);
+                    Assert.AreEqual<String>("Property", viewTables[0].Name);
+                }
+
+                using (View view2 = db.OpenView("INSERT INTO `Property` (`Property`, `Value`) VALUES ('TestViewTables', 1)"))
+                {
+                    IList<TableInfo> viewTables = view2.Tables;
+                    Assert.IsNotNull(viewTables);
+                    Assert.AreEqual<int>(1, viewTables.Count);
+                    Assert.AreEqual<String>("Property", viewTables[0].Name);
+                }
+
+                using (View view3 = db.OpenView("UPDATE `Property` SET `Value` = 2 WHERE `Property` = 'TestViewTables'"))
+                {
+                    IList<TableInfo> viewTables = view3.Tables;
+                    Assert.IsNotNull(viewTables);
+                    Assert.AreEqual<int>(1, viewTables.Count);
+                    Assert.AreEqual<String>("Property", viewTables[0].Name);
+                }
+
+                using (View view4 = db.OpenView("alter table Property hold"))
+                {
+                    IList<TableInfo> viewTables = view4.Tables;
+                    Assert.IsNotNull(viewTables);
+                    Assert.AreEqual<int>(1, viewTables.Count);
+                    Assert.AreEqual<String>("Property", viewTables[0].Name);
+                }
+            }
+        }
+
+        [TestMethod]
+        public void InstallerInstallProduct()
+        {
+            string dbFile = "InstallerInstallProduct.msi";
+            string productCode;
+
+            using (Database db = new Database(dbFile, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db);
+                WindowsInstallerUtils.CreateTestProduct(db);
+
+                productCode = db.ExecuteStringQuery("SELECT `Value` FROM `Property` WHERE `Property` = 'ProductCode'")[0];
+
+                db.Commit();
+            }
+
+            ProductInstallation installation = new ProductInstallation(productCode);
+            Assert.IsFalse(installation.IsInstalled, "Checking that product is not installed before starting.");
+
+            Installer.SetInternalUI(InstallUIOptions.Silent);
+            ExternalUIHandler prevHandler = Installer.SetExternalUI(WindowsInstallerTest.ExternalUILogger,
+                InstallLogModes.FatalExit |
+                InstallLogModes.Error |
+                InstallLogModes.Warning |
+                InstallLogModes.User |
+                InstallLogModes.Info |
+                InstallLogModes.ResolveSource |
+                InstallLogModes.OutOfDiskSpace |
+                InstallLogModes.ActionStart |
+                InstallLogModes.ActionData |
+                InstallLogModes.CommonData |
+                InstallLogModes.Progress |
+                InstallLogModes.Initialize |
+                InstallLogModes.Terminate |
+                InstallLogModes.ShowDialog);
+            Assert.IsNull(prevHandler, "Checking that returned previous UI handler is null.");
+
+            Exception caughtEx = null;
+            try
+            {
+                Installer.InstallProduct(dbFile, String.Empty);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Exception thrown while installing product: " + caughtEx);
+
+            prevHandler = Installer.SetExternalUI(prevHandler, InstallLogModes.None);
+            Assert.AreEqual<ExternalUIHandler>(WindowsInstallerTest.ExternalUILogger, prevHandler, "Checking that previously-set UI handler is returned.");
+
+            Assert.IsTrue(installation.IsInstalled, "Checking that product is installed.");
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine("===================================================================");
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine();
+
+            ExternalUIRecordHandler prevRecHandler = Installer.SetExternalUI(WindowsInstallerTest.ExternalUIRecordLogger,
+                InstallLogModes.FatalExit |
+                InstallLogModes.Error |
+                InstallLogModes.Warning |
+                InstallLogModes.User |
+                InstallLogModes.Info |
+                InstallLogModes.ResolveSource |
+                InstallLogModes.OutOfDiskSpace |
+                InstallLogModes.ActionStart |
+                InstallLogModes.ActionData |
+                InstallLogModes.CommonData |
+                InstallLogModes.Progress |
+                InstallLogModes.Initialize |
+                InstallLogModes.Terminate |
+                InstallLogModes.ShowDialog);
+            Assert.IsNull(prevRecHandler, "Checking that returned previous UI record handler is null.");
+
+            try
+            {
+                Installer.InstallProduct(dbFile, "REMOVE=All");
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Exception thrown while installing product: " + caughtEx);
+
+            Assert.IsFalse(installation.IsInstalled, "Checking that product is not installed after removing.");
+
+            prevRecHandler = Installer.SetExternalUI(prevRecHandler, InstallLogModes.None);
+            Assert.AreEqual<ExternalUIRecordHandler>(WindowsInstallerTest.ExternalUIRecordLogger, prevRecHandler, "Checking that previously-set UI record handler is returned.");
+        }
+
+        public static MessageResult ExternalUILogger(
+            InstallMessage messageType,
+            string message,
+            MessageButtons buttons,
+            MessageIcon icon,
+            MessageDefaultButton defaultButton)
+        {
+            Console.WriteLine("{0}: {1}", messageType, message);
+            return MessageResult.None;
+        }
+
+        public static MessageResult ExternalUIRecordLogger(
+            InstallMessage messageType,
+            Record messageRecord,
+            MessageButtons buttons,
+            MessageIcon icon,
+            MessageDefaultButton defaultButton)
+        {
+            if (messageRecord != null)
+            {
+                if (messageRecord.FormatString.Length == 0 && messageRecord.FieldCount > 0)
+                {
+                    messageRecord.FormatString = "1: [1]   2: [2]   3: [3]   4: [4]  5: [5]";
+                }
+                Console.WriteLine("{0}: {1}", messageType, messageRecord.ToString());
+            }
+            else
+            {
+                Console.WriteLine("{0}: (null)", messageType);
+            }
+            return MessageResult.None;
+        }
+
+        [TestMethod]
+        [Ignore] // Currently fails.
+        public void InstallerMessageResources()
+        {
+            string message1101 = Installer.GetErrorMessage(1101);
+            Console.WriteLine("Message 1101: " + message1101);
+            Assert.IsNotNull(message1101);
+            Assert.IsTrue(message1101.Contains("file"));
+            
+            message1101 = Installer.GetErrorMessage(1101, CultureInfo.GetCultureInfo(1033));
+            Console.WriteLine("Message 1101: " + message1101);
+            Assert.IsNotNull(message1101);
+            Assert.IsTrue(message1101.Contains("file"));
+
+            string message2621 = Installer.GetErrorMessage(2621);
+            Console.WriteLine("Message 2621: " + message2621);
+            Assert.IsNotNull(message2621);
+            Assert.IsTrue(message2621.Contains("DLL"));
+
+            string message3002 = Installer.GetErrorMessage(3002);
+            Console.WriteLine("Message 3002: " + message3002);
+            Assert.IsNotNull(message3002);
+            Assert.IsTrue(message3002.Contains("sequencing"));
+        }
+
+        [TestMethod]
+        public void EnumComponentQualifiers()
+        {
+            foreach (ComponentInstallation comp in ComponentInstallation.AllComponents)
+            {
+                bool qualifiers = false;
+                foreach (ComponentInstallation.Qualifier qualifier in comp.Qualifiers)
+                {
+                    if (!qualifiers)
+                    {
+                        Console.WriteLine(comp.Path);
+                        qualifiers = true;
+                    }
+
+                    Console.WriteLine("\t{0}: {1}", qualifier.QualifierCode, qualifier.Data);
+                }
+            }
+        }
+
+        [TestMethod]
+        public void DeleteRecord()
+        {
+            string dbFile = "DeleteRecord.msi";
+
+            using (Database db = new Database(dbFile, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db);
+                WindowsInstallerUtils.CreateTestProduct(db);
+
+                string query = "SELECT `Property`, `Value` FROM `Property` WHERE `Property` = 'UpgradeCode'";
+
+                using (View view = db.OpenView(query))
+                {
+                    view.Execute();
+
+                    Record rec = view.Fetch();
+
+                    Console.WriteLine("Calling ToString() : " + rec);
+
+                    view.Delete(rec);
+                }
+
+                Assert.AreEqual(0, db.ExecuteStringQuery(query).Count);
+            }
+        }
+
+        [TestMethod]
+        public void InsertRecordThenTryFormatString()
+        {
+            string dbFile = "InsertRecordThenTryFormatString.msi";
+
+            using (Database db = new Database(dbFile, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db);
+                WindowsInstallerUtils.CreateTestProduct(db);
+
+                string parameterFormatString = "[1]";
+                string[] properties = new string[]
+                {
+                    "SonGoku", "Over 9000",
+                };
+
+                string query = "SELECT `Property`, `Value` FROM `Property`";
+
+                using (View view = db.OpenView(query))
+                {
+                    using (Record rec = new Record(2))
+                    {
+                        rec[1] = properties[0];
+                        rec[2] = properties[1];
+                        rec.FormatString = parameterFormatString;
+                        Console.WriteLine("Format String before inserting: " + rec.FormatString);
+                        view.Insert(rec);
+
+                        Console.WriteLine("Format String after inserting: " + rec.FormatString);
+                        // After inserting, the format string is invalid.
+                        Assert.AreEqual(String.Empty, rec.ToString());
+
+                        // Setting the format string manually makes it valid again.
+                        rec.FormatString = parameterFormatString;
+                        Assert.AreEqual(properties[0], rec.ToString());
+                    }
+                }
+            }
+        }
+
+        [TestMethod]
+        public void SeekRecordThenTryFormatString()
+        {
+            string dbFile = "SeekRecordThenTryFormatString.msi";
+
+            using (Database db = new Database(dbFile, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db);
+                WindowsInstallerUtils.CreateTestProduct(db);
+
+                string parameterFormatString = "[1]";
+                string[] properties = new string[]
+                {
+                    "SonGoku", "Over 9000",
+                };
+
+                string query = "SELECT `Property`, `Value` FROM `Property`";
+
+                using (View view = db.OpenView(query))
+                {
+                    using (Record rec = new Record(2))
+                    {
+                        rec[1] = properties[0];
+                        rec[2] = properties[1];
+                        rec.FormatString = parameterFormatString;
+                        Console.WriteLine("Record fields before seeking: " + rec[0] + " " + rec[1] + " " + rec[2]);
+                        view.Seek(rec);
+
+                        //TODO: Why does view.Seek remove the record fields?
+                        Console.WriteLine("Record fields after seeking: " + rec[0] + " " + rec[1] + " " + rec[2]);
+                        // After inserting, the format string is invalid.
+                        Assert.AreEqual(String.Empty, rec.ToString());
+                    }
+                }
+            }
+        }
+        
+        [TestMethod]
+        public void TestToString()
+        {
+            string defaultString = "1:  ";
+            string vegetaShout = "It's OVER 9000!!";
+            string gokuPowerLevel = "9001";
+            string nappaInquiry = "Vegeta, what's the Scouter say about his power level?";
+            string parameterFormatString = "[1]";
+
+            Record rec = new Record(1);
+            Assert.AreEqual(defaultString, rec.ToString(), "Testing default FormatString");
+
+            rec.FormatString = String.Empty;
+            Assert.AreEqual(defaultString, rec.ToString(), "Explicitly set the FormatString to the empty string.");
+
+            rec.FormatString = vegetaShout;
+            Assert.AreEqual(vegetaShout, rec.ToString(), "Testing text only (empty FormatString)");
+
+            rec.FormatString = gokuPowerLevel;
+            Assert.AreEqual(gokuPowerLevel, rec.ToString(), "Testing numbers only from a record that wasn't fetched.");
+
+            Record rec2 = new Record(nappaInquiry);
+            rec2.FormatString = parameterFormatString;
+            Assert.AreEqual(nappaInquiry, rec2.ToString(), "Testing text with a FormatString set.");
+        }
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTransactions.cs b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTransactions.cs
new file mode 100644
index 00000000..3bdf5acd
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerTransactions.cs
@@ -0,0 +1,161 @@
+// 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.Dtf.Test
+{
+    using System;
+    using System.IO;
+    using System.Windows.Forms;
+    using System.Globalization;
+    using System.Collections.Generic;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixToolset.Dtf.WindowsInstaller;
+    using View = WixToolset.Dtf.WindowsInstaller.View;
+
+    [TestClass]
+    public class WindowsInstallerTransactions
+    {
+        [TestInitialize()]
+        public void Initialize()
+        {
+        }
+
+        [TestCleanup()]
+        public void Cleanup()
+        {
+        }
+
+        [TestMethod]
+        [Ignore] // Requires elevation.
+        public void InstallerTransactTwoProducts()
+        {
+            string dbFile1 = "InstallerTransactProduct1.msi";
+            string dbFile2 = "InstallerTransactProduct2.msi";
+            string productCode1;
+            string productCode2;
+
+            using (Database db1 = new Database(dbFile1, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db1);
+                WindowsInstallerUtils.CreateTestProduct(db1);
+
+                productCode1 = db1.ExecuteStringQuery("SELECT `Value` FROM `Property` WHERE `Property` = 'ProductCode'")[0];
+
+                db1.Commit();
+            }
+
+            using (Database db2 = new Database(dbFile2, DatabaseOpenMode.CreateDirect))
+            {
+                WindowsInstallerUtils.InitializeProductDatabase(db2);
+                WindowsInstallerUtils.CreateTestProduct(db2);
+
+                productCode2 = db2.ExecuteStringQuery("SELECT `Value` FROM `Property` WHERE `Property` = 'ProductCode'")[0];
+
+                db2.Commit();
+            }
+
+            ProductInstallation installation1 = new ProductInstallation(productCode1);
+            ProductInstallation installation2 = new ProductInstallation(productCode2);
+            Assert.IsFalse(installation1.IsInstalled, "Checking that product 1 is not installed before starting.");
+            Assert.IsFalse(installation2.IsInstalled, "Checking that product 2 is not installed before starting.");
+
+            Installer.SetInternalUI(InstallUIOptions.Silent);
+            ExternalUIHandler prevHandler = Installer.SetExternalUI(WindowsInstallerTest.ExternalUILogger,
+                InstallLogModes.FatalExit |
+                InstallLogModes.Error |
+                InstallLogModes.Warning |
+                InstallLogModes.User |
+                InstallLogModes.Info |
+                InstallLogModes.ResolveSource |
+                InstallLogModes.OutOfDiskSpace |
+                InstallLogModes.ActionStart |
+                InstallLogModes.ActionData |
+                InstallLogModes.CommonData |
+                InstallLogModes.Progress |
+                InstallLogModes.Initialize |
+                InstallLogModes.Terminate |
+                InstallLogModes.ShowDialog);
+            Assert.IsNull(prevHandler, "Checking that returned previous UI handler is null.");
+
+            Transaction transaction = new Transaction("TestInstallTransaction", TransactionAttributes.None);
+
+            Exception caughtEx = null;
+            try
+            {
+                Installer.InstallProduct(dbFile1, String.Empty);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Exception thrown while installing product 1: " + caughtEx);
+
+            Console.WriteLine();
+            Console.WriteLine("===================================================================");
+            Console.WriteLine();
+
+            try
+            {
+                Installer.InstallProduct(dbFile2, String.Empty);
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Exception thrown while installing product 2: " + caughtEx);
+
+            transaction.Commit();
+            transaction.Close();
+
+            prevHandler = Installer.SetExternalUI(prevHandler, InstallLogModes.None);
+            Assert.AreEqual<ExternalUIHandler>(WindowsInstallerTest.ExternalUILogger, prevHandler, "Checking that previously-set UI handler is returned.");
+
+            Assert.IsTrue(installation1.IsInstalled, "Checking that product 1 is installed.");
+            Assert.IsTrue(installation2.IsInstalled, "Checking that product 2 is installed.");
+
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine("===================================================================");
+            Console.WriteLine("===================================================================");
+            Console.WriteLine();
+            Console.WriteLine();
+            Console.WriteLine();
+
+            ExternalUIRecordHandler prevRecHandler = Installer.SetExternalUI(WindowsInstallerTest.ExternalUIRecordLogger,
+                InstallLogModes.FatalExit |
+                InstallLogModes.Error |
+                InstallLogModes.Warning |
+                InstallLogModes.User |
+                InstallLogModes.Info |
+                InstallLogModes.ResolveSource |
+                InstallLogModes.OutOfDiskSpace |
+                InstallLogModes.ActionStart |
+                InstallLogModes.ActionData |
+                InstallLogModes.CommonData |
+                InstallLogModes.Progress |
+                InstallLogModes.Initialize |
+                InstallLogModes.Terminate |
+                InstallLogModes.ShowDialog);
+            Assert.IsNull(prevRecHandler, "Checking that returned previous UI record handler is null.");
+
+            transaction = new Transaction("TestUninstallTransaction", TransactionAttributes.None);
+
+            try
+            {
+                Installer.InstallProduct(dbFile1, "REMOVE=All");
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Exception thrown while removing product 1: " + caughtEx);
+
+            try
+            {
+                Installer.InstallProduct(dbFile2, "REMOVE=All");
+            }
+            catch (Exception ex) { caughtEx = ex; }
+            Assert.IsNull(caughtEx, "Exception thrown while removing product 2: " + caughtEx);
+
+            transaction.Commit();
+            transaction.Close();
+
+            Assert.IsFalse(installation1.IsInstalled, "Checking that product 1 is not installed after removing.");
+            Assert.IsFalse(installation2.IsInstalled, "Checking that product 2 is not installed after removing.");
+
+            prevRecHandler = Installer.SetExternalUI(prevRecHandler, InstallLogModes.None);
+            Assert.AreEqual<ExternalUIRecordHandler>(WindowsInstallerTest.ExternalUIRecordLogger, prevRecHandler, "Checking that previously-set UI record handler is returned.");
+        }
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerUtils.cs b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerUtils.cs
new file mode 100644
index 00000000..644f1988
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WindowsInstallerUtils.cs
@@ -0,0 +1,174 @@
+// 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.Dtf.Test
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Text;
+    using WixToolset.Dtf.WindowsInstaller;
+
+    public class WindowsInstallerUtils
+    {
+        public static void InitializeProductDatabase(Database db)
+        {
+            InitializeProductDatabase(db, false);
+        }
+
+        public static void InitializeProductDatabase(Database db, bool sixtyFourBit)
+        {
+            db.SummaryInfo.CodePage = (short) Encoding.Default.CodePage;
+            db.SummaryInfo.Title = "Windows Installer Test";
+            db.SummaryInfo.Subject = db.SummaryInfo.Title;
+            db.SummaryInfo.Author = typeof(WindowsInstallerUtils).Assembly.FullName;
+            db.SummaryInfo.CreatingApp = db.SummaryInfo.Author;
+            db.SummaryInfo.Comments = typeof(WindowsInstallerUtils).FullName + ".CreateBasicDatabase()";
+            db.SummaryInfo.Keywords = "Installer,MSI,Database";
+            db.SummaryInfo.PageCount = 300;
+            db.SummaryInfo.WordCount = 0;
+            db.SummaryInfo.RevisionNumber = Guid.NewGuid().ToString("B").ToUpper();
+            db.SummaryInfo.Template = (sixtyFourBit ? "x64" : "Intel") + ";0";
+
+            foreach (TableInfo tableInfo in Schema.Tables)
+            {
+                db.Execute(tableInfo.SqlCreateString);
+            }
+
+            db.Execute("INSERT INTO `Directory` (`Directory`, `DefaultDir`) VALUES ('TARGETDIR', 'SourceDir')");
+            db.Execute("INSERT INTO `Directory` (`Directory`, `Directory_Parent`, `DefaultDir`) VALUES ('ProgramFilesFolder', 'TARGETDIR', '.')");
+
+            foreach (Action action in Sequence.InstallExecute)
+            {
+                db.Execute("INSERT INTO `InstallExecuteSequence` (`Action`, `Sequence`) VALUES ('{0}', {1})",
+                    action.Name, action.Sequence);
+            }
+        }
+
+        public const string UpgradeCode = "{05955FE8-005F-4695-A81F-D559338065BB}";
+
+        public static void CreateTestProduct(Database db)
+        {
+            Guid productGuid = Guid.NewGuid();
+
+            string[] properties = new string[]
+            {
+                "ProductCode", productGuid.ToString("B").ToUpper(),
+                "UpgradeCode", UpgradeCode,
+                "ProductName", "Windows Installer Test Product " + productGuid.ToString("P").ToUpper(),
+                "ProductVersion", "1.0.0.0000",
+            };
+
+            using (View view = db.OpenView("INSERT INTO `Property` (`Property`, `Value`) VALUES (?, ?)"))
+            {
+                using (Record rec = new Record(2))
+                {
+                    for (int i = 0; i < properties.Length; i += 2)
+                    {
+                        rec[1] = properties[i];
+                        rec[2] = properties[i + 1];
+                        view.Execute(rec);
+                    }
+                }
+            }
+
+            int randomId = new Random().Next(10000);
+            string productDir = "TestDir" + randomId;
+            db.Execute(
+                "INSERT INTO `Directory` (`Directory`, `Directory_Parent`, `DefaultDir`) " +
+                "VALUES ('TestDir', 'ProgramFilesFolder', 'TestDir|{0}:.')", productDir);
+
+            string compId = Guid.NewGuid().ToString("B").ToUpper();
+            db.Execute(
+                "INSERT INTO `Component` " +
+                    "(`Component`, `ComponentId`, `Directory_`, `Attributes`, `KeyPath`) " +
+                    "VALUES ('{0}', '{1}', '{2}', {3}, '{4}')",
+                "TestRegComp1",
+                compId,
+                "TestDir",
+                (int) ComponentAttributes.RegistryKeyPath,
+                "TestReg1");
+
+            string productReg = "TestReg" + randomId;
+            db.Execute(
+                "INSERT INTO `Registry` (`Registry`, `Root`, `Key`, `Component_`) VALUES ('{0}', {1}, '{2}', '{3}')",
+                "TestReg1",
+                -1,
+                @"Software\Microsoft\Windows Installer Test\" + productReg,
+                "TestRegComp1");
+
+            db.Execute(
+                "INSERT INTO `Feature` (`Feature`, `Title`, `Level`, `Attributes`) VALUES ('{0}', '{1}', {2}, {3})",
+                "TestFeature1",
+                "Test Feature 1",
+                1,
+                (int) FeatureAttributes.None);
+
+            db.Execute(
+                "INSERT INTO `FeatureComponents` (`Feature_`, `Component_`) VALUES ('{0}', '{1}')",
+                "TestFeature1",
+                "TestRegComp1");
+        }
+
+        public static void AddFeature(Database db, string featureName)
+        {
+            db.Execute(
+                "INSERT INTO `Feature` (`Feature`, `Title`, `Level`, `Attributes`) VALUES ('{0}', '{1}', {2}, {3})",
+                featureName,
+                featureName,
+                1,
+                (int) FeatureAttributes.None);
+        }
+
+        public static void AddRegistryComponent(Database db,
+            string featureName, string compName, string compId,
+            string keyName, string keyValueName, string value)
+        {
+            db.Execute(
+                "INSERT INTO `Component` " +
+                    "(`Component`, `ComponentId`, `Directory_`, `Attributes`, `KeyPath`) " +
+                    "VALUES ('{0}', '{1}', '{2}', {3}, '{4}')",
+                compName,
+                compId,
+                "TestDir",
+                (int) ComponentAttributes.RegistryKeyPath,
+                compName + "Reg1");
+            db.Execute(
+                "INSERT INTO `Registry` (`Registry`, `Root`, `Key`, `Name`, `Value`, `Component_`) VALUES ('{0}', {1}, '{2}', '{3}', '{4}', '{5}')",
+                compName + "Reg1",
+                -1,
+                @"Software\Microsoft\Windows Installer Test\" + keyName,
+                keyValueName,
+                value,
+                compName);
+            db.Execute(
+                "INSERT INTO `FeatureComponents` (`Feature_`, `Component_`) VALUES ('{0}', '{1}')",
+                featureName,
+                compName);
+        }
+
+        public static void AddFileComponent(Database db,
+            string featureName, string compName, string compId,
+            string fileKey, string fileName)
+        {
+            db.Execute(
+                "INSERT INTO `Component` " +
+                    "(`Component`, `ComponentId`, `Directory_`, `Attributes`, `KeyPath`) " +
+                    "VALUES ('{0}', '{1}', '{2}', {3}, '{4}')",
+                compName,
+                compId,
+                "TestDir",
+                (int) ComponentAttributes.None,
+                fileKey);
+            db.Execute(
+                "INSERT INTO `File` " +
+                    "(`File`, `Component_`, `FileName`, `FileSize`, `Attributes`, `Sequence`) " +
+                    "VALUES ('{0}', '{1}', '{2}', 1, 0, 1)",
+                fileKey,
+                compName,
+                fileName);
+            db.Execute(
+                "INSERT INTO `FeatureComponents` (`Feature_`, `Component_`) VALUES ('{0}', '{1}')",
+                featureName,
+                compName);
+        }
+    }
+}
diff --git a/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
new file mode 100644
index 00000000..dbddb682
--- /dev/null
+++ b/src/dtf/WixToolsetTests.Dtf.WindowsInstaller/WixToolsetTests.Dtf.WindowsInstaller.csproj
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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. -->
+
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectGuid>{16F5202F-9276-4166-975C-C9654BAF8012}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>WixToolsetTests.Dtf</RootNamespace>
+    <AssemblyName>WixToolsetTests.Dtf.WindowsInstaller</AssemblyName>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <CreateDocumentation>false</CreateDocumentation>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="EmbeddedExternalUI.cs" />
+    <Compile Include="Schema.cs" />
+    <Compile Include="WindowsInstallerTest.cs" />
+    <Compile Include="WindowsInstallerTransactions.cs" />
+    <Compile Include="WindowsInstallerUtils.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="System" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WixToolset.Dtf.WindowsInstaller\WixToolset.Dtf.WindowsInstaller.csproj" />
+  </ItemGroup>
+
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/src/dtf/appveyor.cmd b/src/dtf/appveyor.cmd
new file mode 100644
index 00000000..6dd50c8a
--- /dev/null
+++ b/src/dtf/appveyor.cmd
@@ -0,0 +1,28 @@
+@setlocal
+@pushd %~dp0
+@set _C=Release
+@set _P=%~dp0build\%_C%\publish
+
+nuget restore || exit /b
+
+msbuild -p:Configuration=%_C% || exit /b
+
+msbuild src\Tools\SfxCA\SfxCA.vcxproj -p:Configuration=%_C% -p:Platform="x64" -p:OutputPath="%_P%\WixToolset.Dtf.MSBuild\tools\\" || exit /b
+msbuild src\Tools\SfxCA\SfxCA.vcxproj -p:Configuration=%_C% -p:Platform="x86" -p:OutputPath="%_P%\WixToolset.Dtf.MSBuild\tools\\" || exit /b
+
+msbuild src\Tools\MakeSfxCA\MakeSfxCA.csproj -p:Configuration=%_C% -p:TargetFramework="net461" -p:OutputPath="%_P%\WixToolset.Dtf.MSBuild\tools\net461" || exit /b
+msbuild src\Tools\MakeSfxCA\MakeSfxCA.csproj -p:Configuration=%_C% -p:TargetFramework="netcoreapp3.1" -p:OutputPath="%_P%\WixToolset.Dtf.MSBuild\tools\netcoreapp3.1" || exit /b
+
+msbuild src\WixToolset.Dtf.MSBuild\WixToolset.Dtf.MSBuild.csproj -p:Configuration=%_C% -p:OutputPath="%_P%\WixToolset.Dtf.MSBuild" || exit /b
+msbuild src\WixToolset.Dtf.MSBuild\WixToolset.Dtf.MSBuild.csproj -target:Pack -p:Configuration=%_C% || exit /b
+
+msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.Compression || exit /b
+msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.Compression.Cab || exit /b
+msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.Compression.Zip || exit /b
+msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.Resources || exit /b
+msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.WindowsInstaller || exit /b
+msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.WindowsInstaller.Linq || exit /b
+msbuild -t:Pack -p:Configuration=%_C% src\WixToolset.Dtf.WindowsInstaller.Package || exit /b
+
+@popd
+@endlocal
\ No newline at end of file
diff --git a/src/dtf/appveyor.yml b/src/dtf/appveyor.yml
new file mode 100644
index 00000000..522e5af3
--- /dev/null
+++ b/src/dtf/appveyor.yml
@@ -0,0 +1,42 @@
+# 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.
+#
+#  Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml
+#  then update all of the repos.
+
+branches:
+  only:
+    - master
+    - develop
+
+image: Visual Studio 2019
+
+version: 0.0.0.{build}
+configuration: Release
+
+environment:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  NUGET_XMLDOC_MODE: skip
+
+build_script:
+  - appveyor.cmd
+
+pull_requests:
+  do_not_increment_build_number: true
+
+nuget:
+  disable_publish_on_pr: true
+
+skip_branch_with_pr: true
+skip_tags: true
+
+artifacts:
+- path: build\Release\**\*.nupkg
+  name: nuget
+- path: build\Release\**\*.msi
+  name: msi
+
+notifications:
+- provider: Slack
+  incoming_webhook:
+    secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA=
diff --git a/src/dtf/nuget.config b/src/dtf/nuget.config
new file mode 100644
index 00000000..6e1ad9b5
--- /dev/null
+++ b/src/dtf/nuget.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>
\ No newline at end of file